[Qemu-devel] [RFC v2 36/39] pc: Move duplicate icc-bridge and CPU initalization to pc_machine_init()

[Eduardo Habkost]

Signed-off-by: Eduardo Habkost <address@hidden>
---
 hw/i386/pc.c      | 6 ++++++
 hw/i386/pc_piix.c | 6 ------
 hw/i386/pc_q35.c  | 5 -----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index fe9937c..9b7854d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1622,6 +1622,12 @@ static void pc_machine_init(MachineState *machine)
         exit(1);
     }
 
+    pcms->icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
+    object_property_add_child(qdev_get_machine(), "icc-bridge",
+                              OBJECT(pcms->icc_bridge), NULL);
+
+    pc_cpus_init(machine->cpu_model, icc_bridge);
+
     if (pcmc->finish_init) {
         pcmc->finish_init(machine);
     }
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 74168c8..a572e9c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -85,12 +85,6 @@ static void pc_init1(MachineState *machine)
     FWCfgState *fw_cfg = NULL;
     PcGuestInfo *guest_info;
 
-    pcms->icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
-    object_property_add_child(qdev_get_machine(), "icc-bridge",
-                              OBJECT(pcms->icc_bridge), NULL);
-
-    pc_cpus_init(machine->cpu_model, pcms->icc_bridge);
-
     if (kvm_enabled() && kvmclock_enabled) {
         kvmclock_create();
     }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index f97b588..392f61f 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -72,11 +72,6 @@ static void pc_q35_init(MachineState *machine)
     PCIDevice *ahci;
     PcGuestInfo *guest_info;
 
-    pcms->icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
-    object_property_add_child(qdev_get_machine(), "icc-bridge",
-                              OBJECT(pcms->icc_bridge), NULL);
-
-    pc_cpus_init(machine->cpu_model, pcms->icc_bridge);
     pc_acpi_init("q35-acpi-dsdt.aml");
 
     kvmclock_create();
-- 
1.9.0