[Qemu-devel] [6460] Check if the i8254 timer is active before deactivating it ( Alexander Graf)

[Qemu-devel] [6460] Check if the i8254 timer is active before deactivating it ( Alexander Graf)

[Anthony Liguori]

Revision: 6460
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6460
Author:   aliguori
Date:     2009-01-26 20:32:18 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Check if the i8254 timer is active before deactivating it (Alexander Graf)

The HPET emulation can disable the i8254 when the HPET is
in legacy mode, thus emulating the i8254's behavior.

But if it does, the i8254 doesn't have to be running, so
let's check to see if the timer works and not disable it
if it's not.

This fixes a segmentation fault when running Mac OS X as
guest os.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/i8254.c

Modified: trunk/hw/i8254.c
===================================================================
--- trunk/hw/i8254.c	2009-01-26 20:27:06 UTC (rev 6459)
+++ trunk/hw/i8254.c	2009-01-26 20:32:18 UTC (rev 6460)
@@ -467,7 +467,8 @@
 void hpet_pit_disable(void) {
     PITChannelState *s;
     s = &pit_state.channels[0];
-    qemu_del_timer(s->irq_timer);
+    if (s->irq_timer)
+        qemu_del_timer(s->irq_timer);
 }
 
 /* When HPET is reset or leaving legacy mode, it must reenable i8254