From patchwork Fri Jan 27 18:21:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 138265 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 03E4BB6F68 for ; Sat, 28 Jan 2012 05:20:49 +1100 (EST) Received: from localhost ([::1]:60561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqqPj-0008US-Vq for incoming@patchwork.ozlabs.org; Fri, 27 Jan 2012 13:20:43 -0500 Received: from eggs.gnu.org ([140.186.70.92]:49557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqqPb-0008UI-BW for qemu-devel@nongnu.org; Fri, 27 Jan 2012 13:20:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqqPZ-0005DO-Gf for qemu-devel@nongnu.org; Fri, 27 Jan 2012 13:20:35 -0500 Received: from smtp.citrix.com ([66.165.176.89]:22163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqqPY-0005DB-Ve for qemu-devel@nongnu.org; Fri, 27 Jan 2012 13:20:33 -0500 X-IronPort-AV: E=Sophos;i="4.71,581,1320642000"; d="scan'208";a="21360001" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 27 Jan 2012 13:20:32 -0500 Received: from smtp01.ad.xensource.com (10.219.128.104) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.213.0; Fri, 27 Jan 2012 13:20:31 -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 q0RIKMUI013482; Fri, 27 Jan 2012 10:20:23 -0800 From: Stefano Stabellini To: qemu-devel@nongnu.org Date: Fri, 27 Jan 2012 18:21:33 +0000 Message-ID: <1327688498-12362-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.89 Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, avi@redhat.com, Stefano Stabellini Subject: [Qemu-devel] [PATCH v3 1/6] 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 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 85304cf..7a7ce98 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 @@ -1130,7 +1131,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); @@ -1151,7 +1152,9 @@ 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); + if (!xen_available()) { + pit = pit_init(isa_bus, 0x40, 0); + } pcspk_init(pit); for(i = 0; i < MAX_SERIAL_PORTS; i++) {