From patchwork Fri Jan 13 17:34:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 135967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9128EB6F68 for ; Sat, 14 Jan 2012 05:49:30 +1100 (EST) Received: from localhost ([::1]:42240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rll3e-0004YI-KR for incoming@patchwork.ozlabs.org; Fri, 13 Jan 2012 12:36:54 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rll2N-0001AH-4m for qemu-devel@nongnu.org; Fri, 13 Jan 2012 12:35:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rll2D-0007kP-ER for qemu-devel@nongnu.org; Fri, 13 Jan 2012 12:35:34 -0500 Received: from goliath.siemens.de ([192.35.17.28]:17126) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rll2D-0007h6-22 for qemu-devel@nongnu.org; Fri, 13 Jan 2012 12:35:25 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id q0DHZFuB016104; Fri, 13 Jan 2012 18:35:15 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q0DHZDOf006138; Fri, 13 Jan 2012 18:35:15 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Fri, 13 Jan 2012 18:34:58 +0100 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Blue Swirl , Anthony Liguori , qemu-devel , kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v6 03/18] apic: Stop timer on reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)