From patchwork Tue Nov 15 14:51:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 125795 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 9A41CB6F9C for ; Wed, 16 Nov 2011 01:50:49 +1100 (EST) Received: from localhost ([::1]:52742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQKLW-0004s1-Oj for incoming@patchwork.ozlabs.org; Tue, 15 Nov 2011 09:50:46 -0500 Received: from eggs.gnu.org ([140.186.70.92]:32933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQKLN-0004rO-Gr for qemu-devel@nongnu.org; Tue, 15 Nov 2011 09:50:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQKLJ-0004sx-8L for qemu-devel@nongnu.org; Tue, 15 Nov 2011 09:50:37 -0500 Received: from smtp.citrix.com ([66.165.176.89]:3149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQKLJ-0004rs-5L for qemu-devel@nongnu.org; Tue, 15 Nov 2011 09:50:33 -0500 X-IronPort-AV: E=Sophos;i="4.69,515,1315195200"; d="scan'208";a="19111203" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 15 Nov 2011 09:50:32 -0500 Received: from smtp01.ad.xensource.com (10.219.128.104) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.137.0; Tue, 15 Nov 2011 09:50:32 -0500 Received: from localhost.localdomain (kaball.uk.xensource.com [10.80.2.59]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id pAFEoIWZ019245; Tue, 15 Nov 2011 06:50:21 -0800 From: To: xen-devel@lists.xensource.com Date: Tue, 15 Nov 2011 14:51:09 +0000 Message-ID: <1321368671-1134-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: qemu-devel@nongnu.org, agraf@suse.de, Stefano Stabellini Subject: [Qemu-devel] [PATCH 2/4] xen: do not initialize the interval timer emulator 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 From: Stefano Stabellini PIT is emulated by the hypervisor so we don't need to emulate it in Qemu: this patch prevents Qemu from waking up needlessly at PIT_FREQ on Xen. Signed-off-by: Stefano Stabellini --- hw/pc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 33778fe..a0ae981 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -43,6 +43,7 @@ #include "ui/qemu-spice.h" #include "memory.h" #include "exec-memory.h" +#include "arch_init.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS @@ -1121,7 +1122,7 @@ void pc_basic_device_init(qemu_irq *gsi, DriveInfo *fd[MAX_FD]; qemu_irq rtc_irq = NULL; qemu_irq *a20_line; - ISADevice *i8042, *port92, *vmmouse, *pit; + ISADevice *i8042, *port92, *vmmouse, *pit = NULL; qemu_irq *cpu_exit_irq; register_ioport_write(0x80, 1, 1, ioport80_write, NULL); @@ -1142,7 +1143,9 @@ void pc_basic_device_init(qemu_irq *gsi, qemu_register_boot_set(pc_boot_set, *rtc_state); - pit = pit_init(0x40, 0); + if (!xen_available()) { + pit = pit_init(0x40, 0); + } pcspk_init(pit); for(i = 0; i < MAX_SERIAL_PORTS; i++) {