summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-10-16 11:59:30 +0200
committerJan Kiszka <jan.kiszka@siemens.com>2012-01-19 12:14:39 +0100
commitab388a98148e5b44ba0b6bc0269fdb983b4a6838 (patch)
tree3563d95790c77f0fd21bd79d40d77661041b0e40 /hw
parent3b9a6ee50e88c47f64486b6b143b1363fa5c327c (diff)
downloadqemu-ab388a98148e5b44ba0b6bc0269fdb983b4a6838.tar.gz
apic: Stop timer on reset
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/apic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/apic.c b/hw/apic.c
index 9d0f460b58..4b97b17dbe 100644
--- 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)