QOM patches for 2020-05-15

[PULL 12/21] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory

Markus Armbruster posted 21 patches 5 years, 9 months ago

Download mbox

Maintainers: Peter Maydell <peter.maydell@linaro.org>, Igor Mammedov <imammedo@redhat.com>, Keith Busch <kbusch@kernel.org>, Fam Zheng <fam@euphon.net>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, Subbaraya Sundeep <sundeep.lkml@gmail.com>, Leif Lindholm <leif@nuviainc.com>, Sergio Lopez <slp@redhat.com>, Alistair Francis <alistair@alistair23.me>, Cornelia Huck <cohuck@redhat.com>, Niek Linnenbank <nieklinnenbank@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, "Cédric Le Goater" <clg@kaod.org>, Jean-Christophe Dubois <jcd@tribudubois.net>, Li Zhijian <lizhijian@cn.fujitsu.com>, Marek Vasut <marex@denx.de>, Corey Minyard <minyard@acm.org>, Sven Schnelle <svens@stackframe.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Paul Durrant <paul@xen.org>, Andrew Baumann <Andrew.Baumann@microsoft.com>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Xiao Guangrong <xiaoguangrong.eric@gmail.com>, Andrew Jeffery <andrew@aj.id.au>, Pierre Morel <pmorel@linux.ibm.com>, BALATON Zoltan <balaton@eik.bme.hu>, Andrzej Zaborowski <balrogg@gmail.com>, Beniamino Galvani <b.galvani@gmail.com>, "Hervé Poussineau" <hpoussin@reactos.org>, Alex Williamson <alex.williamson@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Max Reitz <mreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Jason Wang <jasowang@redhat.com>, Eric Farman <farman@linux.ibm.com>, Gerd Hoffmann <kraxel@redhat.com>, David Hildenbrand <david@redhat.com>, Palmer Dabbelt <palmer@dabbelt.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Anthony Perard <anthony.perard@citrix.com>, Chris Wulff <crwulff@gmail.com>, Andrey Smirnov <andrew.smirnov@gmail.com>, Stefano Stabellini <sstabellini@kernel.org>, John Snow <jsnow@redhat.com>, Jiri Slaby <jslaby@suse.cz>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Markus Armbruster <armbru@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Radoslaw Biernacki <radoslaw.biernacki@linaro.org>, Raphael Norwitz <raphael.norwitz@nutanix.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Laszlo Ersek <lersek@redhat.com>, Zhang Chen <chen.zhang@intel.com>, Amit Shah <amit@kernel.org>, Alberto Garcia <berto@igalia.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Laurent Vivier <lvivier@redhat.com>, David Gibson <david@gibson.dropbear.id.au>, Aurelien Jarno <aurelien@aurel32.net>, Richard Henderson <rth@twiddle.net>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Stefan Weil <sw@weilnetz.de>, Joel Stanley <joel@jms.id.au>, Christian Borntraeger <borntraeger@de.ibm.com>, Eduardo Habkost <ehabkost@redhat.com>, Tony Krowiak <akrowiak@linux.ibm.com>

Expand all Fold all

[PULL 12/21] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory

Posted by Markus Armbruster 5 years, 9 months ago

The "bcm2835-peripherals" device's .instance_init() method
bcm2835_peripherals_init() attempts to make two memory regions QOM
children of the device.  This is futile, because memory_region_init()
already did.  The errors are ignored (a later commit will change
that).  Drop the useless calls.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrew Baumann <Andrew.Baumann@microsoft.com>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200505152926.18877-13-armbru@redhat.com>
---
 hw/arm/bcm2835_peripherals.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
index edcaa4916d..8b399d67ff 100644
--- a/hw/arm/bcm2835_peripherals.c
+++ b/hw/arm/bcm2835_peripherals.c
@@ -43,12 +43,10 @@ static void bcm2835_peripherals_init(Object *obj)
 
     /* Memory region for peripheral devices, which we export to our parent */
     memory_region_init(&s->peri_mr, obj,"bcm2835-peripherals", 0x1000000);
-    object_property_add_child(obj, "peripheral-io", OBJECT(&s->peri_mr), NULL);
     sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->peri_mr);
 
     /* Internal memory region for peripheral bus addresses (not exported) */
     memory_region_init(&s->gpu_bus_mr, obj, "bcm2835-gpu", (uint64_t)1 << 32);
-    object_property_add_child(obj, "gpu-bus", OBJECT(&s->gpu_bus_mr), NULL);
 
     /* Internal memory region for request/response communication with
      * mailbox-addressable peripherals (not exported)
-- 
2.21.1