Le 24/05/2023 à 23:10, Mark Cave-Ayland a écrit :
This will enable us later to distinguish between QOM initialisation and machine
initialisation.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
---
hw/m68k/q800.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index bdccd93c7f..976da06231 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -361,7 +361,7 @@ static uint8_t fake_mac_rom[] = {
0x60, 0xFE /* bras [self] */
};
-static void q800_init(MachineState *machine)
+static void q800_machine_init(MachineState *machine)
{
M68kCPU *cpu = NULL;
int linux_boot;
@@ -737,8 +737,9 @@ static const size_t hw_compat_q800_len =
G_N_ELEMENTS(hw_compat_q800);
static void q800_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+
mc->desc = "Macintosh Quadra 800";
- mc->init = q800_init;
+ mc->init = q800_machine_init;
mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
mc->max_cpus = 1;
mc->block_default_type = IF_SCSI;
Reviewed-by: Laurent Vivier <laur...@vivier.eu>