ia64/xen-unstable

changeset 11066:bd11c4855c5d

[qemu] Disable qemu's acpi support.

Based on a patch from: Wang, Winston L <winston.l.wang@intel.com>
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Wed Aug 09 19:57:03 2006 +0100 (2006-08-09)
parents 9fc1979e9b00
children 8a615d28759e
files tools/ioemu/hw/pc.c
line diff
     1.1 --- a/tools/ioemu/hw/pc.c	Wed Aug 09 18:15:27 2006 +0100
     1.2 +++ b/tools/ioemu/hw/pc.c	Wed Aug 09 19:57:03 2006 +0100
     1.3 @@ -885,9 +885,11 @@ static void pc_init1(uint64_t ram_size, 
     1.4          usb_uhci_init(pci_bus, piix3_devfn + 2);
     1.5      }
     1.6  
     1.7 -    if (pci_enabled && acpi_enabled && 0) {
     1.8 +#ifndef CONFIG_DM
     1.9 +    if (pci_enabled && acpi_enabled) {
    1.10          piix4_pm_init(pci_bus, piix3_devfn + 3);
    1.11      }
    1.12 +#endif /* !CONFIG_DM */
    1.13  
    1.14  #if 0
    1.15      /* ??? Need to figure out some way for the user to
    1.16 @@ -910,8 +912,10 @@ static void pc_init1(uint64_t ram_size, 
    1.17      /* XXX: should be done in the Bochs BIOS */
    1.18      if (pci_enabled) {
    1.19          pci_bios_init();
    1.20 +#ifndef CONFIG_DM
    1.21          if (acpi_enabled)
    1.22              acpi_bios_init();
    1.23 +#endif /* !CONFIG_DM */
    1.24      }
    1.25  }
    1.26