[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/23] q800: rename q800_init() to q800_machine_init()
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 04/23] q800: rename q800_init() to q800_machine_init() |
Date: |
Sun, 4 Jun 2023 14:14:31 +0100 |
This will enable us later to distinguish between QOM initialisation and machine
initialisation.
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>
---
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 93a3f96991..3730b30dd1 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -362,7 +362,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;
@@ -738,8 +738,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;
--
2.30.2
- [PATCH v3 00/23] q800: add support for booting MacOS Classic - part 1, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 02/23] q800: add missing space after parent object in GLUEState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 03/23] q800: introduce Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 01/23] q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 04/23] q800: rename q800_init() to q800_machine_init(),
Mark Cave-Ayland <=
- [PATCH v3 05/23] q800: move CPU object into Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 06/23] q800: move ROM memory region to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 07/23] q800: move GLUE device into separate q800-glue.c file, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 08/23] q800: move GLUE device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 09/23] q800: introduce mac-io container memory region, Mark Cave-Ayland, 2023/06/04