ACPI support

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1902 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 5 insertions, 0 deletions

diff --git a/hw/pc.c b/hw/pc.c
index 4add257dc3..b9bfd83a57 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -836,10 +836,15 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
         usb_attach(usb_root_ports[0], vm_usb_hub);
     }
 
+    if (pci_enabled && acpi_enabled) {
+        piix4_pm_init(pci_bus);
+    }
     /* must be done after all PCI devices are instanciated */
     /* XXX: should be done in the Bochs BIOS */
     if (pci_enabled) {
         pci_bios_init();
+        if (acpi_enabled)
+            acpi_bios_init();
     }
 }