qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
	"BALATON Zoltan" <balaton@eik.bme.hu>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Ovchinnikov Vitalii" <vitalii.ovchinnikov@auriga.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Jared Mauch" <jared+home@puck.nether.net>,
	"Fabiano Rosas" <farosas@suse.de>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	qemu-arm@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	devel@lists.libvirt.org
Subject: [PATCH v2 01/12] hw/arm/raspi: Access SoC parent object using BCM283X_BASE() macro
Date: Tue,  4 Feb 2025 01:22:29 +0100	[thread overview]
Message-ID: <20250204002240.97830-2-philmd@linaro.org> (raw)
In-Reply-To: <20250204002240.97830-1-philmd@linaro.org>

We shouldn't access a QOM parent object directly.
Use the appropriate type-cast macro.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/arm/raspi.c   | 2 +-
 hw/arm/raspi4b.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index a7a662f40db..508f90479e2 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -312,7 +312,7 @@ void raspi_machine_init(MachineState *machine)
 
     object_initialize_child(OBJECT(machine), "soc", soc,
                             board_soc_type(mc->board_rev));
-    raspi_base_machine_init(machine, &soc->parent_obj);
+    raspi_base_machine_init(machine, BCM283X_BASE(soc));
 }
 
 void raspi_machine_class_common_init(MachineClass *mc,
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 1264e0d6eed..9b08a598f39 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -104,7 +104,7 @@ static void raspi4b_machine_init(MachineState *machine)
     object_initialize_child(OBJECT(machine), "soc", soc,
                             board_soc_type(mc->board_rev));
 
-    raspi_base_machine_init(machine, &soc->parent_obj);
+    raspi_base_machine_init(machine, BCM283X_BASE(soc));
 }
 
 static void raspi4b_machine_class_init(ObjectClass *oc, void *data)
-- 
2.47.1



  reply	other threads:[~2025-02-04  0:23 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-04  0:22 [PATCH v2 00/12] hw/arm/raspi: Allow creating any Raspberry Pi machine Philippe Mathieu-Daudé
2025-02-04  0:22 ` Philippe Mathieu-Daudé [this message]
2025-02-04 15:01   ` [PATCH v2 01/12] hw/arm/raspi: Access SoC parent object using BCM283X_BASE() macro Peter Maydell
2025-02-04  0:22 ` [PATCH v2 02/12] hw/arm/raspi: Merge model 4B with other models Philippe Mathieu-Daudé
2025-02-04 15:02   ` Peter Maydell
2025-02-04  0:22 ` [PATCH v2 03/12] hw/arm/raspi: Unify RASPI_MACHINE types Philippe Mathieu-Daudé
2025-02-04 15:06   ` Peter Maydell
2025-02-04  0:22 ` [PATCH v2 04/12] hw/arm/raspi: Pass board_rev as argument to raspi_base_machine_init() Philippe Mathieu-Daudé
2025-02-04  0:22 ` [PATCH v2 05/12] hw/arm/raspi: Consider processor id in types[] array Philippe Mathieu-Daudé
2025-02-04 15:08   ` Peter Maydell
2025-02-04  0:22 ` [PATCH v2 06/12] hw/arm/raspi: Consider network interface for B models Philippe Mathieu-Daudé
2025-02-04 15:09   ` Peter Maydell
2025-02-04  0:22 ` [PATCH v2 07/12] hw/arm/raspi: Check ramsize is within chipset aperture Philippe Mathieu-Daudé
2025-02-04 15:10   ` Peter Maydell
2025-02-04  0:22 ` [PATCH v2 08/12] hw/arm/raspi: Introduce generic Raspberry Pi machine Philippe Mathieu-Daudé
2025-02-04  0:22 ` [PATCH v2 09/12] hw/arm/raspi: Have the generic machine take a 'revision' property Philippe Mathieu-Daudé
2025-02-04  0:22 ` [PATCH v2 10/12] hw/arm/raspi: List models creatable by the generic 'raspi' machine Philippe Mathieu-Daudé
2025-02-04  0:22 ` [PATCH v2 11/12] hw/arm/raspi: Deprecate old raspiX machine names Philippe Mathieu-Daudé
2025-02-04  9:22   ` Peter Maydell
2025-02-04  9:51     ` Philippe Mathieu-Daudé
2025-02-04  9:57       ` Daniel P. Berrangé
2025-02-04 10:48         ` Philippe Mathieu-Daudé
2025-02-04 10:51           ` Daniel P. Berrangé
2025-02-04 11:13         ` Peter Maydell
2025-02-04 13:40           ` Philippe Mathieu-Daudé
2025-02-04 13:52             ` Peter Maydell
2025-02-04 14:59               ` Philippe Mathieu-Daudé
2025-02-04  9:58       ` BALATON Zoltan
2025-02-22 21:57         ` Jared Mauch
2025-02-04  0:22 ` [PATCH v2 12/12] hw/arm/raspi: Support more models Philippe Mathieu-Daudé

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=20250204002240.97830-2-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=balaton@eik.bme.hu \
    --cc=berrange@redhat.com \
    --cc=devel@lists.libvirt.org \
    --cc=farosas@suse.de \
    --cc=jared+home@puck.nether.net \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=vitalii.ovchinnikov@auriga.com \
    /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).