From e0dd114c163bfba86a736dae00fb70758e1c0200 Mon Sep 17 00:00:00 2001 From: aliguori Date: Mon, 26 Jan 2009 20:32:18 +0000 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6460 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/i8254.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i8254.c b/hw/i8254.c index a4a1efe9c..44e453139 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -467,7 +467,8 @@ static void pit_reset(void *opaque) 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 -- 2.39.2