diff -r ababeabf87c5 tools/firmware/acpi/acpi_fadt.h
--- a/tools/firmware/acpi/acpi_fadt.h	Mon Aug  7 16:07:20 2006 +0100
+++ b/tools/firmware/acpi/acpi_fadt.h	Mon Aug  7 16:17:01 2006 -0700
@@ -59,9 +59,7 @@
 #define ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID  ACPI_SYSTEM_IO
 #define ACPI_PM1A_EVT_BLK_BIT_WIDTH         0x20
 #define ACPI_PM1A_EVT_BLK_BIT_OFFSET        0x00
-//#define ACPI_PM1A_EVT_BLK_ADDRESS           0x000000000000c010
-#define ACPI_PM1A_EVT_BLK_ADDRESS           0x000000000000c040
-
+#define ACPI_PM1A_EVT_BLK_ADDRESS           0x000000000000c010
 //
 // PM1B Event Register Block Generic Address Information
 //
diff -r ababeabf87c5 tools/ioemu/hw/piix4acpi.c
--- a/tools/ioemu/hw/piix4acpi.c	Mon Aug  7 16:07:20 2006 +0100
+++ b/tools/ioemu/hw/piix4acpi.c	Mon Aug  7 16:17:01 2006 -0700
@@ -380,10 +380,10 @@
     PCIAcpiState *d;
     uint8_t *pci_conf;
 
-    /* register a function 3 of PIIX4 */
+    /* register a function 2 of PIIX4 */
     d = (PCIAcpiState *)pci_register_device(
         bus, "PIIX4 ACPI", sizeof(PCIAcpiState),
-        ((PCIDevice *)piix3_state)->devfn + 3, NULL, NULL);
+        ((PCIDevice *)piix3_state)->devfn + 2, NULL, NULL);
 
     acpi_state = d;
     pci_conf = d->dev.config;
diff -r ababeabf87c5 tools/ioemu/hw/usb-uhci.c
--- a/tools/ioemu/hw/usb-uhci.c	Mon Aug  7 16:07:20 2006 +0100
+++ b/tools/ioemu/hw/usb-uhci.c	Mon Aug  7 16:17:01 2006 -0700
@@ -643,11 +643,16 @@
     UHCIState *s;
     uint8_t *pci_conf;
     UHCIPort *port;
+    uint8_t usb_bridge_nu = 0x2;
     int i;
 
+    /* register a usb as pci device function 2 of PIIX4 by default if no acpi bridge */
+    if (acpi_enabled!=0){
+        usb_bridge_nu ++;
+    }
     s = (UHCIState *)pci_register_device(bus,
                                         "USB-UHCI", sizeof(UHCIState),
-                                        ((PCIDevice *)piix3_state)->devfn + 2, 
+                                        ((PCIDevice *)piix3_state)->devfn + usb_bridge_nu, 
                                         NULL, NULL);
     pci_conf = s->dev.config;
     pci_conf[0x00] = 0x86;