Re: [PATCH 04/30] q800: move CPU object into Q800MachineState

[Philippe Mathieu-Daudé]

On 24/5/23 23:10, Mark Cave-Ayland wrote:

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

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 976da06231..ee6175ceb4 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -363,7 +363,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;
@@ -406,8 +406,8 @@ static void q800_machine_init(MachineState *machine)
      }

/* init CPUs */

-    cpu = M68K_CPU(cpu_create(machine->cpu_type));
-    qemu_register_reset(main_cpu_reset, cpu);
+    m->cpu = M68K_CPU(cpu_create(machine->cpu_type));
+    qemu_register_reset(main_cpu_reset, m->cpu);

/* RAM */

      memory_region_add_subregion(get_system_memory(), 0, machine->ram);

diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 560fd6f93d..5867c3ae33 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -29,9 +29,11 @@

struct Q800MachineState {

      MachineState parent_obj;
+
+    M68kCPU *cpu;

This is a good opportunity to allocate M68kCPU in Q800MachineState
and call object_initialize_child/qdev_realize instead of cpu_create.

Can be done later, so meanwhile:
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>

  };

#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")

-OBJECT_DECLARE_SIMPLE_TYPE(Q800MachineState, q800, Q800_MACHINE, MachineState)
+OBJECT_DECLARE_SIMPLE_TYPE(Q800MachineState, Q800_MACHINE)

#endif