]> git.proxmox.com Git - qemu.git/commitdiff
apic: Stop timer on reset
authorJan Kiszka <jan.kiszka@siemens.com>
Sun, 16 Oct 2011 09:59:30 +0000 (11:59 +0200)
committerJan Kiszka <jan.kiszka@siemens.com>
Thu, 19 Jan 2012 11:14:39 +0000 (12:14 +0100)
All LVTs are masked on reset, so the timer becomes ineffective. Letting
it tick nevertheless is harmless, but will at least create a spurious
trace event.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
hw/apic.c

index 9d0f460b585ca6824a5c14af4bebdea9463e8e91..4b97b17dbe442a72200cf60a2b9d7b51f0e82182 100644 (file)
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -528,6 +528,8 @@ void apic_init_reset(DeviceState *d)
     s->initial_count_load_time = 0;
     s->next_time = 0;
     s->wait_for_sipi = 1;
+
+    qemu_del_timer(s->timer);
 }
 
 static void apic_startup(APICState *s, int vector_num)