Commit 5462cc81 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200505152926.18877-13-armbru@redhat.com>
parent a13f2042

hw/arm/bcm2835_peripherals.c

+0 −2
Original line number Diff line number Diff line
@@ -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)