From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Luc Michel" <luc@lmichel.fr>,
qemu-trivial@nongnu.org, "Michael Tokarev" <mjt@tls.msk.ru>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
"Laurent Vivier" <laurent@vivier.eu>,
qemu-arm@nongnu.org
Subject: [RFC PATCH 1/2] hw/arm/raspi: Trivial code movement
Date: Sun, 31 Jan 2021 16:14:09 +0100 [thread overview]
Message-ID: <20210131151410.318649-2-f4bug@amsat.org> (raw)
In-Reply-To: <20210131151410.318649-1-f4bug@amsat.org>
Move the abstract TYPE_BCM283X and TYPE_RASPI_MACHINE declarations
earlier to make the next commit easier to review.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/arm/bcm2836.c | 32 +++++++++++++++++---------------
hw/arm/raspi.c | 18 ++++++++++--------
2 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index de7ade2878e..fd16ed87c40 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -219,20 +219,6 @@ static void bcm2837_class_init(ObjectClass *oc, void *data)
static const TypeInfo bcm283x_types[] = {
{
- .name = TYPE_BCM2835,
- .parent = TYPE_BCM283X,
- .class_init = bcm2835_class_init,
- }, {
- .name = TYPE_BCM2836,
- .parent = TYPE_BCM283X,
- .class_init = bcm2836_class_init,
-#ifdef TARGET_AARCH64
- }, {
- .name = TYPE_BCM2837,
- .parent = TYPE_BCM283X,
- .class_init = bcm2837_class_init,
-#endif
- }, {
.name = TYPE_BCM283X,
.parent = TYPE_DEVICE,
.instance_size = sizeof(BCM283XState),
@@ -240,7 +226,23 @@ static const TypeInfo bcm283x_types[] = {
.class_size = sizeof(BCM283XClass),
.class_init = bcm283x_class_init,
.abstract = true,
- }
+ },
+ {
+ .name = TYPE_BCM2835,
+ .parent = TYPE_BCM283X,
+ .class_init = bcm2835_class_init,
+ }, {
+ .name = TYPE_BCM2836,
+ .parent = TYPE_BCM283X,
+ .class_init = bcm2836_class_init,
+ },
+#ifdef TARGET_AARCH64
+ {
+ .name = TYPE_BCM2837,
+ .parent = TYPE_BCM283X,
+ .class_init = bcm2837_class_init,
+ },
+#endif
};
DEFINE_TYPES(bcm283x_types)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 990509d3852..dce966a4dd8 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -369,6 +369,13 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
#endif /* TARGET_AARCH64 */
static const TypeInfo raspi_machine_types[] = {
+ {
+ .name = TYPE_RASPI_MACHINE,
+ .parent = TYPE_MACHINE,
+ .instance_size = sizeof(RaspiMachineState),
+ .class_size = sizeof(RaspiMachineClass),
+ .abstract = true,
+ },
{
.name = MACHINE_TYPE_NAME("raspi0"),
.parent = TYPE_RASPI_MACHINE,
@@ -381,8 +388,9 @@ static const TypeInfo raspi_machine_types[] = {
.name = MACHINE_TYPE_NAME("raspi2b"),
.parent = TYPE_RASPI_MACHINE,
.class_init = raspi2b_machine_class_init,
+ },
#ifdef TARGET_AARCH64
- }, {
+ {
.name = MACHINE_TYPE_NAME("raspi3ap"),
.parent = TYPE_RASPI_MACHINE,
.class_init = raspi3ap_machine_class_init,
@@ -390,14 +398,8 @@ static const TypeInfo raspi_machine_types[] = {
.name = MACHINE_TYPE_NAME("raspi3b"),
.parent = TYPE_RASPI_MACHINE,
.class_init = raspi3b_machine_class_init,
+ },
#endif
- }, {
- .name = TYPE_RASPI_MACHINE,
- .parent = TYPE_MACHINE,
- .instance_size = sizeof(RaspiMachineState),
- .class_size = sizeof(RaspiMachineClass),
- .abstract = true,
- }
};
DEFINE_TYPES(raspi_machine_types)
--
2.26.2
next prev parent reply other threads:[~2021-01-31 15:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-31 15:14 [RFC PATCH 0/2] hw/arm/raspi: Restrict BCM2835 / BCM2836 SoC to TCG Philippe Mathieu-Daudé
2021-01-31 15:14 ` Philippe Mathieu-Daudé [this message]
2021-02-01 8:09 ` [RFC PATCH 1/2] hw/arm/raspi: Trivial code movement Luc Michel
2021-01-31 15:14 ` [RFC PATCH 2/2] hw/arm/raspi: Restrict BCM2835 / BCM2836 SoC to TCG Philippe Mathieu-Daudé
2021-02-01 8:18 ` Luc Michel
2021-02-01 8:46 ` Philippe Mathieu-Daudé
2021-02-01 9:04 ` Paolo Bonzini
2021-02-02 12:28 ` Peter Maydell
2021-02-02 13:29 ` Philippe Mathieu-Daudé
2021-02-02 13:47 ` Peter Maydell
2021-02-02 14:26 ` Philippe Mathieu-Daudé
2021-02-02 12:25 ` [RFC PATCH 0/2] " 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=20210131151410.318649-2-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=Andrew.Baumann@microsoft.com \
--cc=laurent@vivier.eu \
--cc=luc@lmichel.fr \
--cc=mjt@tls.msk.ru \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.