From patchwork Thu Jan 19 11:24:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v8,03/18] apic: Stop timer on reset Date: Thu, 19 Jan 2012 01:24:55 -0000 From: Jan Kiszka X-Patchwork-Id: 136820 Message-Id: To: Avi Kivity , Marcelo Tosatti Cc: Blue Swirl , Anthony Liguori , qemu-devel , kvm@vger.kernel.org, "Michael S. Tsirkin" 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 --- hw/apic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/apic.c b/hw/apic.c index 9d0f460..4b97b17 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)