[Xen-changelog] [xen-unstable] [qemu] HVM acpi port init update.

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

# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 8a615d28759ed01c9e259fd369e493c0edfb1c5e
# Parent  bd11c4855c5d32252eb819a83d8153c46cb904fa
[qemu] HVM acpi port init update.
Removed the acpi port depency on USB exist.

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

diff -r bd11c4855c5d -r 8a615d28759e tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c       Wed Aug 09 19:57:03 2006 +0100
+++ b/tools/ioemu/hw/pc.c       Wed Aug 09 20:07:01 2006 +0100
@@ -877,13 +877,13 @@ static void pc_init1(uint64_t ram_size, 
 
     cmos_init(ram_size, boot_device, bs_table, timeoffset);
 
+    if (pci_enabled && usb_enabled) {
+        usb_uhci_init(pci_bus, piix3_devfn + 2);
+    }
+
     /* using PIIX4 acpi model */
     if (pci_enabled && acpi_enabled)
-        pci_piix4_acpi_init(pci_bus, piix3_devfn + 3);
-
-    if (pci_enabled && usb_enabled) {
-        usb_uhci_init(pci_bus, piix3_devfn + 2);
-    }
+        pci_piix4_acpi_init(pci_bus, piix3_devfn + (usb_enabled ? 3 : 2));
 
 #ifndef CONFIG_DM
     if (pci_enabled && acpi_enabled) {
diff -r bd11c4855c5d -r 8a615d28759e tools/ioemu/hw/piix4acpi.c
--- a/tools/ioemu/hw/piix4acpi.c        Wed Aug 09 19:57:03 2006 +0100
+++ b/tools/ioemu/hw/piix4acpi.c        Wed Aug 09 20:07:01 2006 +0100
@@ -380,7 +380,7 @@ void pci_piix4_acpi_init(PCIBus *bus, in
     PCIAcpiState *d;
     uint8_t *pci_conf;
 
-    /* register a function 3 of PIIX4 */
+    /* register a function devfn of PIIX4 */
     d = (PCIAcpiState *)pci_register_device(
         bus, "PIIX4 ACPI", sizeof(PCIAcpiState),
         devfn, NULL, NULL);

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