From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Joaquin de Andres" <me@xcancerberox.com.ar>,
"Alistair Francis" <alistair@alistair23.me>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
"Esteban Bosse" <estebanbosse@gmail.com>,
"Niek Linnenbank" <nieklinnenbank@gmail.com>,
qemu-arm@nongnu.org, "Igor Mammedov" <imammedo@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v3 09/13] hw/arm/raspi: Let class_init() directly call raspi_machine_init()
Date: Sat, 8 Feb 2020 17:56:41 +0100 [thread overview]
Message-ID: <20200208165645.15657-10-f4bug@amsat.org> (raw)
In-Reply-To: <20200208165645.15657-1-f4bug@amsat.org>
raspi_machine_init() access to board_rev via RaspiMachineClass.
raspi2_init() and raspi3_init() do nothing. Call raspi_machine_init
directly.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Squash with previous?
---
hw/arm/raspi.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index fbfcd29732..1628b0dda7 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -228,7 +228,7 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo);
}
-static void raspi_init(MachineState *machine)
+static void raspi_machine_init(MachineState *machine)
{
RaspiMachineClass *mc = RASPI_MACHINE_GET_CLASS(machine);
RaspiMachineState *s = RASPI_MACHINE(machine);
@@ -280,11 +280,6 @@ static void raspi_init(MachineState *machine)
setup_boot(machine, version, machine->ram_size - vcram_size);
}
-static void raspi2_init(MachineState *machine)
-{
- raspi_init(machine);
-}
-
static void raspi2_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -293,7 +288,7 @@ static void raspi2_machine_class_init(ObjectClass *oc, void *data)
rmc->board_rev = board_rev;
mc->desc = "Raspberry Pi 2B";
- mc->init = raspi2_init;
+ mc->init = raspi_machine_init;
mc->block_default_type = IF_SD;
mc->no_parallel = 1;
mc->no_floppy = 1;
@@ -306,11 +301,6 @@ static void raspi2_machine_class_init(ObjectClass *oc, void *data)
};
#ifdef TARGET_AARCH64
-static void raspi3_init(MachineState *machine)
-{
- raspi_init(machine);
-}
-
static void raspi3_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -319,7 +309,7 @@ static void raspi3_machine_class_init(ObjectClass *oc, void *data)
rmc->board_rev = board_rev;
mc->desc = "Raspberry Pi 3B";
- mc->init = raspi3_init;
+ mc->init = raspi_machine_init;
mc->block_default_type = IF_SD;
mc->no_parallel = 1;
mc->no_floppy = 1;
--
2.21.1
next prev parent reply other threads:[~2020-02-08 16:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-08 16:56 [PATCH v3 00/13] hw/arm/raspi: Dynamically create machines based on the board revision Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 01/13] hw/arm/raspi: Use BCM2708 machine type with pre Device Tree kernels Philippe Mathieu-Daudé
2020-02-09 22:53 ` Niek Linnenbank
2020-02-08 16:56 ` [PATCH v3 02/13] hw/arm/raspi: Correct the board descriptions Philippe Mathieu-Daudé
2020-02-09 22:51 ` Niek Linnenbank
2020-02-09 23:02 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 03/13] hw/arm/raspi: Extract the version from the board revision Philippe Mathieu-Daudé
2020-02-13 13:40 ` Peter Maydell
2020-02-13 13:53 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 04/13] hw/arm/raspi: Extract the RAM size " Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 05/13] hw/arm/raspi: Extract the processor type " Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 06/13] hw/arm/raspi: Trivial code movement Philippe Mathieu-Daudé
2020-02-10 9:58 ` Igor Mammedov
2020-02-08 16:56 ` [PATCH v3 07/13] hw/arm/raspi: Make machines children of abstract RaspiMachineClass Philippe Mathieu-Daudé
2020-02-10 9:45 ` Igor Mammedov
2020-02-08 16:56 ` [PATCH v3 08/13] hw/arm/raspi: Make board_rev a field of RaspiMachineClass Philippe Mathieu-Daudé
2020-02-10 9:50 ` Igor Mammedov
2020-02-10 10:03 ` Philippe Mathieu-Daudé
2020-02-10 13:09 ` Igor Mammedov
2020-02-08 16:56 ` Philippe Mathieu-Daudé [this message]
2020-02-10 9:55 ` [PATCH v3 09/13] hw/arm/raspi: Let class_init() directly call raspi_machine_init() Igor Mammedov
2020-02-08 16:56 ` [PATCH v3 10/13] hw/arm/raspi: Set default RAM size to size encoded in board revision Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 11/13] hw/arm/raspi: Extract the board model from the " Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 12/13] hw/arm/raspi: Use a unique raspi_machine_class_init() method Philippe Mathieu-Daudé
2020-02-10 10:01 ` Igor Mammedov
2020-02-13 13:59 ` Peter Maydell
2020-02-13 14:15 ` Philippe Mathieu-Daudé
2020-02-13 14:32 ` Peter Maydell
2020-02-13 15:33 ` Philippe Mathieu-Daudé
2020-02-15 17:45 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 13/13] hw/arm/raspi: Extract the cores count from the board revision Philippe Mathieu-Daudé
2020-02-10 10:03 ` Igor Mammedov
2020-02-13 14:00 ` [PATCH v3 00/13] hw/arm/raspi: Dynamically create machines based on " Peter Maydell
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=20200208165645.15657-10-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=Andrew.Baumann@microsoft.com \
--cc=alistair@alistair23.me \
--cc=estebanbosse@gmail.com \
--cc=imammedo@redhat.com \
--cc=me@xcancerberox.com.ar \
--cc=nieklinnenbank@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.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).