vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

q800: move CPU object into Q800MachineState 

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

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-6-mark.cave-ayland@ilande.co.uk>
[lv: update commit message]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
master
Mark Cave-Ayland 2023-06-21 09:53:34 +01:00 committed by Laurent Vivier
parent 1a514d3a8a
commit 36e2e338b3
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/m68k/q800.c
View File

@ -364,7 +364,7 @@ static uint8_t fake_mac_rom[] = {
static void q800_machine_init(MachineState *machine) static void q800_machine_init(MachineState *machine)
{ {
M68kCPU *cpu = NULL; Q800MachineState *m = Q800_MACHINE(machine);
int linux_boot; int linux_boot;
int32_t kernel_size; int32_t kernel_size;
uint64_t elf_entry; uint64_t elf_entry;
@ -407,8 +407,9 @@ static void q800_machine_init(MachineState *machine)
} }
/* init CPUs */ /* init CPUs */
cpu = M68K_CPU(cpu_create(machine->cpu_type)); object_initialize_child(OBJECT(machine), "cpu", &m->cpu, machine->cpu_type);
qemu_register_reset(main_cpu_reset, cpu); qdev_realize(DEVICE(&m->cpu), NULL, &error_fatal);
qemu_register_reset(main_cpu_reset, &m->cpu);
/* RAM */ /* RAM */
memory_region_add_subregion(get_system_memory(), 0, machine->ram); memory_region_add_subregion(get_system_memory(), 0, machine->ram);
@ -430,7 +431,8 @@ static void q800_machine_init(MachineState *machine)
/* IRQ Glue */ /* IRQ Glue */
glue = qdev_new(TYPE_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); sysbus_realize_and_unref(SYS_BUS_DEVICE(glue), &error_fatal);
/* VIA 1 */ /* VIA 1 */
@ -605,7 +607,7 @@ static void q800_machine_init(MachineState *machine)
macfb_mode = (NUBUS_MACFB(dev)->macfb).mode; macfb_mode = (NUBUS_MACFB(dev)->macfb).mode;
cs = CPU(cpu); cs = CPU(&m->cpu);
if (linux_boot) { if (linux_boot) {
uint64_t high; uint64_t high;
void *param_blob, *param_ptr, *param_rng_seed; 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 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) static void q800_machine_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); 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->desc = "Macintosh Quadra 800";
mc->init = q800_machine_init; mc->init = q800_machine_init;
mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040"); mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
mc->valid_cpu_types = q800_machine_valid_cpu_types;
mc->max_cpus = 1; mc->max_cpus = 1;
mc->block_default_type = IF_SCSI; mc->block_default_type = IF_SCSI;
mc->default_ram_id = "m68k_mac.ram"; mc->default_ram_id = "m68k_mac.ram";

3
include/hw/m68k/q800.h
View File

@ -25,6 +25,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "qom/object.h" #include "qom/object.h"
#include "target/m68k/cpu-qom.h"
/* /*
* The main Q800 machine * The main Q800 machine
@ -32,6 +33,8 @@
struct Q800MachineState { struct Q800MachineState {
MachineState parent_obj; MachineState parent_obj;
M68kCPU cpu;
}; };
#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800") #define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")