From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <laurent@vivier.eu>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 04/24] q800: rename q800_init() to q800_machine_init()
Date: Thu, 22 Jun 2023 09:55:24 +0200 [thread overview]
Message-ID: <20230622075544.210899-5-laurent@vivier.eu> (raw)
In-Reply-To: <20230622075544.210899-1-laurent@vivier.eu>
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Message-Id: <20230621085353.113233-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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 c0256c8a904c..062a3c6c7614 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.40.1
next prev parent reply other threads:[~2023-06-22 7:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 7:55 [PULL 00/24] Q800 for 8.1 patches Laurent Vivier
2023-06-22 7:55 ` [PULL 01/24] q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array Laurent Vivier
2023-06-22 7:55 ` [PULL 02/24] q800: add missing space after parent object in GLUEState Laurent Vivier
2023-06-22 7:55 ` [PULL 03/24] q800: introduce Q800MachineState Laurent Vivier
2023-06-22 7:55 ` Laurent Vivier [this message]
2023-06-22 7:55 ` [PULL 05/24] q800: move CPU object into Q800MachineState Laurent Vivier
2023-06-22 7:55 ` [PULL 06/24] q800: move ROM memory region to Q800MachineState Laurent Vivier
2023-06-22 7:55 ` [PULL 07/24] q800: move GLUE device into separate q800-glue.c file Laurent Vivier
2023-06-22 7:55 ` [PULL 08/24] q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro Laurent Vivier
2023-06-22 7:55 ` [PULL 09/24] q800: move GLUE device to Q800MachineState Laurent Vivier
2023-06-22 7:55 ` [PULL 10/24] q800: introduce mac-io container memory region Laurent Vivier
2023-06-22 7:55 ` [PULL 11/24] q800: reimplement mac-io region aliasing using IO " Laurent Vivier
2023-06-22 7:55 ` [PULL 12/24] q800: move VIA1 device to Q800MachineState Laurent Vivier
2023-06-22 7:55 ` [PULL 13/24] q800: move VIA2 " Laurent Vivier
2023-06-22 7:55 ` [PULL 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h Laurent Vivier
2023-06-22 7:55 ` [PULL 15/24] q800: move dp8393x device to Q800MachineState Laurent Vivier
2023-06-22 7:55 ` [PULL 16/24] q800: move ESCC " Laurent Vivier
2023-06-22 7:55 ` [PULL 17/24] q800: move escc_orgate " Laurent Vivier
2023-06-22 7:55 ` [PULL 18/24] q800: move ESP " Laurent Vivier
2023-06-22 7:55 ` [PULL 19/24] q800: move SWIM " Laurent Vivier
2023-06-22 7:55 ` [PULL 20/24] q800: move mac-nubus-bridge " Laurent Vivier
2023-06-22 7:55 ` [PULL 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device Laurent Vivier
2023-06-22 7:55 ` [PULL 22/24] q800: move macfb device to Q800MachineState Laurent Vivier
2023-06-22 7:55 ` [PULL 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf Laurent Vivier
2023-06-22 7:55 ` [PULL 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers Laurent Vivier
2023-06-22 13:17 ` [PULL 00/24] Q800 for 8.1 patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230622075544.210899-5-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).