[Qemu-devel] [PATCH arm-devs v1 5/6] arm/xilinx_zynq: Use object_new() rather than cpu_arm_init()

[Peter Crosthwaite]

To allow the machine model to set device properties before CPU
realization.

Signed-off-by: Peter Crosthwaite <address@hidden>
---

 hw/arm/xilinx_zynq.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 46924a0..b4553e8 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -110,15 +110,20 @@ static void zynq_init(QEMUMachineInitArgs *args)
     SysBusDevice *busdev;
     qemu_irq pic[64];
     NICInfo *nd;
+    Error *err = NULL;
     int n;
 
     if (!cpu_model) {
         cpu_model = "cortex-a9";
     }
+    cpu_model = g_strdup_printf("%s-" TYPE_ARM_CPU, cpu_model);
 
-    cpu = cpu_arm_init(cpu_model);
-    if (!cpu) {
-        fprintf(stderr, "Unable to find CPU definition\n");
+    cpu = ARM_CPU(object_new(cpu_model));
+    g_free((void *)cpu_model);
+
+    object_property_set_bool(OBJECT(cpu), true, "realized", &err);
+    if (err) {
+        fprintf(stderr, "%s\n", error_get_pretty(err));
         exit(1);
     }
 
-- 
1.8.4.4