| Message ID | 20200428163419.4483-12-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qom: Spring cleaning | expand |
On 4/28/20 6:34 PM, Markus Armbruster wrote: > 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> > --- > 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) > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
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)
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> --- hw/arm/bcm2835_peripherals.c | 2 -- 1 file changed, 2 deletions(-)