| Message ID | 20230604131450.428797-6-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | q800: add support for booting MacOS Classic - part 1 | expand |
Le 04/06/2023 à 15:14, Mark Cave-Ayland a écrit : > 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-ayland@ilande.co.uk> > --- > hw/m68k/q800.c | 18 +++++++++++++----- > include/hw/m68k/q800.h | 3 +++ > 2 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c > index 3730b30dd1..d0ceb64b70 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,9 @@ 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, machine->cpu_type); > + object_property_set_bool(OBJECT(&m->cpu), "realized", true, &error_fatal); > + qemu_register_reset(main_cpu_reset, &m->cpu); > > /* RAM */ > memory_region_add_subregion(get_system_memory(), 0, machine->ram); > @@ -430,7 +431,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 +607,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; > @@ -735,6 +737,11 @@ static GlobalProperty hw_compat_q800[] = { > }; > static const size_t hw_compat_q800_len = G_N_ELEMENTS(hw_compat_q800); > > +static const char *q800_machine_valid_cpu_types[] = { > + M68K_CPU_TYPE_NAME("m68040"), > + NULL > +}; > + > static void q800_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -742,6 +749,7 @@ static void q800_machine_class_init(ObjectClass *oc, void *data) > mc->desc = "Macintosh Quadra 800"; > mc->init = q800_machine_init; > mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040"); > + mc->valid_cpu_types = q800_machine_valid_cpu_types; > mc->max_cpus = 1; > mc->block_default_type = IF_SCSI; > mc->default_ram_id = "m68k_mac.ram"; > diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h > index f3bc17aa1b..4cb1a51dfe 100644 > --- a/include/hw/m68k/q800.h > +++ b/include/hw/m68k/q800.h > @@ -25,6 +25,7 @@ > > #include "hw/boards.h" > #include "qom/object.h" > +#include "target/m68k/cpu-qom.h" > > /* > * The main Q800 machine > @@ -32,6 +33,8 @@ > > struct Q800MachineState { > MachineState parent_obj; > + > + M68kCPU cpu; > }; > > #define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800") Reviewed-by: Laurent Vivier <laurent@vivier.eu>
On 4/6/23 15:14, 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-ayland@ilande.co.uk> > --- > hw/m68k/q800.c | 18 +++++++++++++----- > include/hw/m68k/q800.h | 3 +++ > 2 files changed, 16 insertions(+), 5 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 3730b30dd1..d0ceb64b70 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,9 @@ 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, machine->cpu_type); + object_property_set_bool(OBJECT(&m->cpu), "realized", true, &error_fatal); + qemu_register_reset(main_cpu_reset, &m->cpu); /* RAM */ memory_region_add_subregion(get_system_memory(), 0, machine->ram); @@ -430,7 +431,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 +607,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; @@ -735,6 +737,11 @@ static GlobalProperty hw_compat_q800[] = { }; static const size_t hw_compat_q800_len = G_N_ELEMENTS(hw_compat_q800); +static const char *q800_machine_valid_cpu_types[] = { + M68K_CPU_TYPE_NAME("m68040"), + NULL +}; + static void q800_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -742,6 +749,7 @@ static void q800_machine_class_init(ObjectClass *oc, void *data) mc->desc = "Macintosh Quadra 800"; mc->init = q800_machine_init; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040"); + mc->valid_cpu_types = q800_machine_valid_cpu_types; mc->max_cpus = 1; mc->block_default_type = IF_SCSI; mc->default_ram_id = "m68k_mac.ram"; diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h index f3bc17aa1b..4cb1a51dfe 100644 --- a/include/hw/m68k/q800.h +++ b/include/hw/m68k/q800.h @@ -25,6 +25,7 @@ #include "hw/boards.h" #include "qom/object.h" +#include "target/m68k/cpu-qom.h" /* * The main Q800 machine @@ -32,6 +33,8 @@ struct Q800MachineState { MachineState parent_obj; + + M68kCPU cpu; }; #define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")
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-ayland@ilande.co.uk> --- hw/m68k/q800.c | 18 +++++++++++++----- include/hw/m68k/q800.h | 3 +++ 2 files changed, 16 insertions(+), 5 deletions(-)