Re: [PATCH v2 05/23] q800: move CPU object into Q800MachineState

[Philippe Mathieu-Daudé]

On 31/5/23 14:53, Mark Cave-Ayland wrote:

Also change the instantiation of the CPU to use object_initialize_child()
followed by a separate realisation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
---
  hw/m68k/q800.c         | 13 ++++++++-----
  include/hw/m68k/q800.h |  2 ++
  2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 3730b30dd1..c34b2548ca 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -364,7 +364,7 @@ static uint8_t fake_mac_rom[] = {

static void q800_machine_init(MachineState *machine)

  {
-    M68kCPU *cpu = NULL;
+    Q800MachineState *m = Q800_MACHINE(machine);
      int linux_boot;
      int32_t kernel_size;
      uint64_t elf_entry;
@@ -407,8 +407,10 @@ static void q800_machine_init(MachineState *machine)
      }

/* init CPUs */

-    cpu = M68K_CPU(cpu_create(machine->cpu_type));
-    qemu_register_reset(main_cpu_reset, cpu);
+    object_initialize_child(OBJECT(machine), "cpu", &m->cpu,
+                            M68K_CPU_TYPE_NAME("m68040"));
+    object_property_set_bool(OBJECT(&m->cpu), "realized", true, &error_fatal);

CPUs are QDev-based, shouldn't we use qdev_realize()?

+    qemu_register_reset(main_cpu_reset, &m->cpu);

/* RAM */

      memory_region_add_subregion(get_system_memory(), 0, machine->ram);
@@ -430,7 +432,8 @@ static void q800_machine_init(MachineState *machine)

/* IRQ Glue */

      glue = qdev_new(TYPE_GLUE);
-    object_property_set_link(OBJECT(glue), "cpu", OBJECT(cpu), &error_abort);
+    object_property_set_link(OBJECT(glue), "cpu", OBJECT(&m->cpu),
+                             &error_abort);
      sysbus_realize_and_unref(SYS_BUS_DEVICE(glue), &error_fatal);

/* VIA 1 */

@@ -605,7 +608,7 @@ static void q800_machine_init(MachineState *machine)

macfb_mode = (NUBUS_MACFB(dev)->macfb).mode; - cs = CPU(cpu);

+    cs = CPU(&m->cpu);
      if (linux_boot) {
          uint64_t high;
          void *param_blob, *param_ptr, *param_rng_seed;
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 76ea6560b2..0f54f1c2cf 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -29,6 +29,8 @@

struct Q800MachineState {

      MachineState parent_obj;
+
+    M68kCPU cpu;

Declared in "target/m68k/cpu-qom.h" (missing #include).

  };

#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")