From patchwork Tue Jan 31 16:12:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v4, 1/6] xen: do not initialize the interval timer and PCSPK emulator Date: Tue, 31 Jan 2012 06:12:49 -0000 From: Stefano Stabellini X-Patchwork-Id: 138803 Message-Id: <1328026374-12803-1-git-send-email-stefano.stabellini@eu.citrix.com> To: xen-devel@lists.xensource.com Cc: Stefano Stabellini , jan.kiszka@siemens.com, qemu-devel@nongnu.org, avi@redhat.com, pbonzini@redhat.com 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 31608d3..18abee0 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 @@ -1137,7 +1138,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); @@ -1158,8 +1159,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]) {