aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-09-25 21:42:45 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-05 09:32:49 -0500
commit3f84865ade594a2ec1ef613ab5fd11949f3d49de (patch)
tree0e0080e944f87ca8590e7027a6b5e663f1954d12 /hw/pc.c
parentee995ffbf7b2b190b17d65bbd8f85218679156ad (diff)
pci: windup acpi-based hotplug
Switch over acpi-based PCI hotplug for pc over to the new qdev-based pci hotplugging. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 573ada6749..aea0f5428e 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1353,8 +1353,6 @@ static void pc_init1(ram_addr_t ram_size,
pci_nic_init(nd, "e1000", NULL);
}
- piix4_acpi_system_hot_add_init();
-
if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
fprintf(stderr, "qemu: too many IDE bus\n");
exit(1);
@@ -1405,6 +1403,7 @@ static void pc_init1(ram_addr_t ram_size,
qdev_prop_set_ptr(eeprom, "data", eeprom_buf + (i * 256));
qdev_init(eeprom);
}
+ piix4_acpi_system_hot_add_init(pci_bus);
}
if (i440fx_state) {