[Xen-changelog] [xen-unstable] [qemu] Disable qemu's acpi support.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID bd11c4855c5d32252eb819a83d8153c46cb904fa
# Parent  9fc1979e9b00216b82d32a875088b28778cbf5d4
[qemu] Disable qemu's acpi support.

Based on a patch from: Wang, Winston L <winston.l.wang@xxxxxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
 tools/ioemu/hw/pc.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -r 9fc1979e9b00 -r bd11c4855c5d tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c       Wed Aug 09 18:15:27 2006 +0100
+++ b/tools/ioemu/hw/pc.c       Wed Aug 09 19:57:03 2006 +0100
@@ -885,9 +885,11 @@ static void pc_init1(uint64_t ram_size, 
         usb_uhci_init(pci_bus, piix3_devfn + 2);
     }
 
-    if (pci_enabled && acpi_enabled && 0) {
+#ifndef CONFIG_DM
+    if (pci_enabled && acpi_enabled) {
         piix4_pm_init(pci_bus, piix3_devfn + 3);
     }
+#endif /* !CONFIG_DM */
 
 #if 0
     /* ??? Need to figure out some way for the user to
@@ -910,8 +912,10 @@ static void pc_init1(uint64_t ram_size, 
     /* XXX: should be done in the Bochs BIOS */
     if (pci_enabled) {
         pci_bios_init();
+#ifndef CONFIG_DM
         if (acpi_enabled)
             acpi_bios_init();
+#endif /* !CONFIG_DM */
     }
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog