1 files changed, 23 insertions, 52 deletions

diff --git a/hw/i8254.c b/hw/i8254.c
index 430077baa..3688ab8ad 100644
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -30,8 +30,6 @@
 
 //#define DEBUG_PIT
 
-static PITState pit_state;
-
 static void pit_irq_timer_update(PITChannelState *s, int64_t current_time);
 
 static int pit_get_count(PITChannelState *s)
@@ -213,7 +211,7 @@ static inline void pit_load_count(PITState *s, int val, int chan)
     s->channels[chan].count_load_time = qemu_get_clock_ns(vm_clock);
     s->channels[chan].count = val;
 #ifdef TARGET_I386
-    if (chan == 0 && pit_state.flags & PIT_FLAGS_HPET_LEGACY) {
+    if (chan == 0 && s->channels[0].irq_disabled) {
         return;
     }
 #endif
@@ -352,8 +350,9 @@ static void pit_irq_timer_update(PITChannelState *s, int64_t current_time)
     int64_t expire_time;
     int irq_level;
 
-    if (!s->irq_timer)
+    if (!s->irq_timer || s->irq_disabled) {
         return;
+    }
     expire_time = pit_get_next_transition_time(s, current_time);
     irq_level = pit_get_out1(s, current_time);
     qemu_set_irq(s->irq, irq_level);
@@ -409,7 +408,7 @@ static int pit_load_old(QEMUFile *f, void *opaque, int version_id)
     if (version_id != PIT_SAVEVM_VERSION)
         return -EINVAL;
 
-    pit->flags = qemu_get_be32(f);
+    (void)qemu_get_be32(f);
     for(i = 0; i < 3; i++) {
         s = &pit->channels[i];
         s->count=qemu_get_be32(f);
@@ -425,6 +424,7 @@ static int pit_load_old(QEMUFile *f, void *opaque, int version_id)
         qemu_get_8s(f, &s->bcd);
         qemu_get_8s(f, &s->gate);
         s->count_load_time=qemu_get_be64(f);
+        s->irq_disabled = 0;
         if (s->irq_timer) {
             s->next_transition_time=qemu_get_be64(f);
             qemu_get_timer(f, s->irq_timer);
@@ -436,12 +436,12 @@ static int pit_load_old(QEMUFile *f, void *opaque, int version_id)
 
 VMStateDescription vmstate_pit = {
     .name = "i8254",
-    .version_id = 2,
+    .version_id = 3,
     .minimum_version_id = 2,
     .minimum_version_id_old = 1,
     .load_state_old = pit_load_old,
     .fields      = (VMStateField []) {
-        VMSTATE_UINT32(flags, PITState),
+        VMSTATE_UINT32_V(channels[0].irq_disabled, PITState, 3),
         VMSTATE_STRUCT_ARRAY(channels, PITState, 3, 2, vmstate_pit_channel, PITChannelState),
         VMSTATE_TIMER(channels[0].irq_timer, PITState),
         VMSTATE_END_OF_LIST()
@@ -455,7 +455,7 @@ static void pit_reset(DeviceState *dev)
     int i;
 
 #ifdef TARGET_I386
-    pit->flags &= ~PIT_FLAGS_HPET_LEGACY;
+    pit->channels[0].irq_disabled = 0;
 #endif
     for(i = 0;i < 3; i++) {
         s = &pit->channels[i];
@@ -463,7 +463,7 @@ static void pit_reset(DeviceState *dev)
         s->gate = (i != 2);
         s->count_load_time = qemu_get_clock_ns(vm_clock);
         s->count = 0x10000;
-        if (i == 0) {
+        if (i == 0 && !s->irq_disabled) {
             s->next_transition_time =
                 pit_get_next_transition_time(s, s->count_load_time);
             qemu_mod_timer(s->irq_timer, s->next_transition_time);
@@ -474,50 +474,21 @@ static void pit_reset(DeviceState *dev)
     }
 }
 
-#ifdef TARGET_I386
-/* When HPET is operating in legacy mode, i8254 timer0 is disabled */
-
-void hpet_pit_disable(void)
-{
-    PITChannelState *s = &pit_state.channels[0];
-
-    if (kvm_enabled() && kvm_irqchip_in_kernel()) {
-        if (kvm_has_pit_state2()) {
-            kvm_hpet_disable_kpit();
-        } else {
-             fprintf(stderr, "%s: kvm does not support pit_state2!\n", __FUNCTION__);
-             exit(1);
-        }
-    } else {
-        pit_state.flags |= PIT_FLAGS_HPET_LEGACY;
-        if (s->irq_timer) {
-            qemu_del_timer(s->irq_timer);
-        }
-    }
-}
-
-/* When HPET is reset or leaving legacy mode, it must reenable i8254
- * timer 0
- */
-
-void hpet_pit_enable(void)
+/* When HPET is operating in legacy mode, suppress the ignored timer IRQ,
+ * reenable it when legacy mode is left again. */
+static void pit_irq_control(void *opaque, int n, int enable)
 {
-    PITState *pit = &pit_state;
+    PITState *pit = opaque;
     PITChannelState *s = &pit->channels[0];
 
-    if (kvm_enabled() && kvm_irqchip_in_kernel()) {
-        if (kvm_has_pit_state2()) {
-            kvm_hpet_enable_kpit();
-        } else {
-             fprintf(stderr, "%s: kvm does not support pit_state2!\n", __FUNCTION__);
-             exit(1);
-        }
+    if (enable) {
+        s->irq_disabled = 0;
+        pit_irq_timer_update(s, qemu_get_clock_ns(vm_clock));
     } else {
-        pit_state.flags &= ~PIT_FLAGS_HPET_LEGACY;
-        pit_load_count(pit, s->count, 0);
+        s->irq_disabled = 1;
+        qemu_del_timer(s->irq_timer);
     }
 }
-#endif
 
 static const MemoryRegionPortio pit_portio[] = {
     { 0, 4, 1, .write = pit_ioport_write },
@@ -535,9 +506,10 @@ static int pit_initfn(ISADevice *dev)
     PITChannelState *s;
 
 #ifdef CONFIG_KVM_PIT
-    if (kvm_enabled() && kvm_irqchip_in_kernel())
+    if (kvm_enabled() && kvm_irqchip_in_kernel()) {
         kvm_pit_init(pit);
-    else {
+        return 0;
+    }
 #endif
 
     s = &pit->channels[0];
@@ -548,9 +520,8 @@ static int pit_initfn(ISADevice *dev)
     memory_region_init_io(&pit->ioports, &pit_ioport_ops, pit, "pit", 4);
     isa_register_ioport(dev, &pit->ioports, pit->iobase);
 
-#ifdef CONFIG_KVM_PIT
-    }
-#endif
+    qdev_init_gpio_in(&dev->qdev, pit_irq_control, 1);
+
     qdev_set_legacy_instance_id(&dev->qdev, pit->iobase, 2);
 
     return 0;