From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Mon, 14 Nov 2011 15:07:01 +0000 (+0000)
Subject: xen: do not initialize the interval timer and PCSPK emulator
X-Git-Tag: qemu-xen-4.2.0~17
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f782f3f80f524f876792a6d89086bd488cf7743b;p=qemu-upstream-4.2-testing.git

xen: do not initialize the interval timer and PCSPK emulator

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 <stefano.stabellini@eu.citrix.com>
---

diff --git a/hw/pc.c b/hw/pc.c
index 33778fe42..6a4ba8a6c 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -43,6 +43,8 @@
 #include "ui/qemu-spice.h"
 #include "memory.h"
 #include "exec-memory.h"
+#include "arch_init.h"
+#include "xen.h"
 
 /* output Bochs bios info messages */
 //#define DEBUG_BIOS
@@ -1121,7 +1123,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,8 +1144,10 @@ void pc_basic_device_init(qemu_irq *gsi,
 
     qemu_register_boot_set(pc_boot_set, *rtc_state);
 
-    pit = pit_init(0x40, 0);
-    pcspk_init(pit);
+    if (!xen_enabled()) {
+        pit = pit_init(0x40, 0);
+        pcspk_init(pit);
+    }
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {