ia64/xen-unstable

changeset 11067:8a615d28759e

[qemu] HVM acpi port init update.
Removed the acpi port depency on USB exist.

Based on a patch from: Winston Wang <winston.l.wang@intel.com>
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Wed Aug 09 20:07:01 2006 +0100 (2006-08-09)
parents bd11c4855c5d
children 404277b96e27
files tools/ioemu/hw/pc.c tools/ioemu/hw/piix4acpi.c
line diff
     1.1 --- a/tools/ioemu/hw/pc.c	Wed Aug 09 19:57:03 2006 +0100
     1.2 +++ b/tools/ioemu/hw/pc.c	Wed Aug 09 20:07:01 2006 +0100
     1.3 @@ -877,14 +877,14 @@ static void pc_init1(uint64_t ram_size, 
     1.4  
     1.5      cmos_init(ram_size, boot_device, bs_table, timeoffset);
     1.6  
     1.7 -    /* using PIIX4 acpi model */
     1.8 -    if (pci_enabled && acpi_enabled)
     1.9 -        pci_piix4_acpi_init(pci_bus, piix3_devfn + 3);
    1.10 -
    1.11      if (pci_enabled && usb_enabled) {
    1.12          usb_uhci_init(pci_bus, piix3_devfn + 2);
    1.13      }
    1.14  
    1.15 +    /* using PIIX4 acpi model */
    1.16 +    if (pci_enabled && acpi_enabled)
    1.17 +        pci_piix4_acpi_init(pci_bus, piix3_devfn + (usb_enabled ? 3 : 2));
    1.18 +
    1.19  #ifndef CONFIG_DM
    1.20      if (pci_enabled && acpi_enabled) {
    1.21          piix4_pm_init(pci_bus, piix3_devfn + 3);
     2.1 --- a/tools/ioemu/hw/piix4acpi.c	Wed Aug 09 19:57:03 2006 +0100
     2.2 +++ b/tools/ioemu/hw/piix4acpi.c	Wed Aug 09 20:07:01 2006 +0100
     2.3 @@ -380,7 +380,7 @@ void pci_piix4_acpi_init(PCIBus *bus, in
     2.4      PCIAcpiState *d;
     2.5      uint8_t *pci_conf;
     2.6  
     2.7 -    /* register a function 3 of PIIX4 */
     2.8 +    /* register a function devfn of PIIX4 */
     2.9      d = (PCIAcpiState *)pci_register_device(
    2.10          bus, "PIIX4 ACPI", sizeof(PCIAcpiState),
    2.11          devfn, NULL, NULL);