---

yaml
---
r: 282047
b: refs/heads/master
c: a647795
h: refs/heads/master
i:
  282045: b934fd0
  282043: 4b8c0ef
  282039: 8a9b991
  282031: 1849f53
  282015: 1ac73ce
  281983: 1d8411c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb5a798ad58996e4d666ead1016705854d5ca616
+refs/heads/master: a647795efbedeedf8a1dc6deded26defa23562bd

trunk/arch/x86/kvm/i8254.c

@@ -344,7 +344,7 @@ static void create_pit_timer(struct kvm *kvm, u32 val, int is_period)
 	struct kvm_timer *pt = &ps->pit_timer;
 	s64 interval;
 
-	if (!irqchip_in_kernel(kvm))
+	if (!irqchip_in_kernel(kvm) || ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)
 		return;
 
 	interval = muldiv64(val, NSEC_PER_SEC, KVM_PIT_FREQ);
@@ -397,15 +397,11 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
 	case 1:
         /* FIXME: enhance mode 4 precision */
 	case 4:
-		if (!(ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)) {
-			create_pit_timer(kvm, val, 0);
-		}
+		create_pit_timer(kvm, val, 0);
 		break;
 	case 2:
 	case 3:
-		if (!(ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)){
-			create_pit_timer(kvm, val, 1);
-		}
+		create_pit_timer(kvm, val, 1);
 		break;
 	default:
 		destroy_pit_timer(kvm->arch.vpit);