From patchwork Tue Feb 14 15:07:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 141116 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 CBA8F1007D1 for ; Wed, 15 Feb 2012 02:03:24 +1100 (EST) Received: from localhost ([::1]:44759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RxJuc-0003ci-Qw for incoming@patchwork.ozlabs.org; Tue, 14 Feb 2012 10:03:22 -0500 Received: from eggs.gnu.org ([140.186.70.92]:55847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RxJuS-0003bZ-GD for qemu-devel@nongnu.org; Tue, 14 Feb 2012 10:03:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RxJuK-0002Vo-DP for qemu-devel@nongnu.org; Tue, 14 Feb 2012 10:03:12 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:34852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RxJuK-0002VA-1m for qemu-devel@nongnu.org; Tue, 14 Feb 2012 10:03:04 -0500 X-IronPort-AV: E=Sophos;i="4.73,417,1325480400"; d="scan'208";a="181690788" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Feb 2012 10:03:03 -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.213.0; Tue, 14 Feb 2012 10:03:02 -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 q1EF2rxc028319; Tue, 14 Feb 2012 07:02:54 -0800 From: Stefano Stabellini To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2012 15:07:13 +0000 Message-ID: <1329232038-12349-1-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.63 Cc: xen-devel@lists.xensource.com, Stefano Stabellini , jan.kiszka@siemens.com, avi@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v5 1/6] xen: do not initialize the interval timer and PCSPK 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 PIT and PCSPK are emulated by the hypervisor so we don't need to emulate them in Qemu: this patch prevents Qemu from waking up needlessly at PIT_FREQ on Xen. Signed-off-by: Stefano Stabellini --- hw/pc.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 7f3aa65..ab9775e 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -44,6 +44,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 @@ -1139,7 +1140,7 @@ void pc_basic_device_init(ISABus *isa_bus, 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); @@ -1160,8 +1161,10 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, qemu_register_boot_set(pc_boot_set, *rtc_state); - pit = pit_init(isa_bus, 0x40, 0); - pcspk_init(pit); + if (!xen_available()) { + pit = pit_init(isa_bus, 0x40, 0); + pcspk_init(pit); + } for(i = 0; i < MAX_SERIAL_PORTS; i++) { if (serial_hds[i]) {