Message ID | 20190507163416.24647-5-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw: Use object_initialize_child for correct reference counting | expand |
On 07/05/19 11:34, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/arm/bcm2835_peripherals.c | 2 +- > include/hw/arm/bcm2835_peripherals.h | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c > index 6be7660e8cb..7ffb51b6927 100644 > --- a/hw/arm/bcm2835_peripherals.c > +++ b/hw/arm/bcm2835_peripherals.c > @@ -46,7 +46,7 @@ static void bcm2835_peripherals_init(Object *obj) > qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default()); > > /* UART0 */ > - s->uart0 = SYS_BUS_DEVICE(object_new("pl011")); > + s->uart0 = SYS_BUS_DEVICE(object_new(TYPE_PL011)); > object_property_add_child(obj, "uart0", OBJECT(s->uart0), NULL); > qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default()); > > diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h > index f5b193f6707..959508d57dd 100644 > --- a/include/hw/arm/bcm2835_peripherals.h > +++ b/include/hw/arm/bcm2835_peripherals.h > @@ -13,6 +13,7 @@ > > #include "qemu-common.h" > #include "hw/sysbus.h" > +#include "hw/char/pl011.h" > #include "hw/char/bcm2835_aux.h" > #include "hw/display/bcm2835_fb.h" > #include "hw/dma/bcm2835_dma.h" > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
On Tue, May 7, 2019 at 9:41 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/arm/bcm2835_peripherals.c | 2 +- > include/hw/arm/bcm2835_peripherals.h | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c > index 6be7660e8cb..7ffb51b6927 100644 > --- a/hw/arm/bcm2835_peripherals.c > +++ b/hw/arm/bcm2835_peripherals.c > @@ -46,7 +46,7 @@ static void bcm2835_peripherals_init(Object *obj) > qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default()); > > /* UART0 */ > - s->uart0 = SYS_BUS_DEVICE(object_new("pl011")); > + s->uart0 = SYS_BUS_DEVICE(object_new(TYPE_PL011)); > object_property_add_child(obj, "uart0", OBJECT(s->uart0), NULL); > qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default()); > > diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h > index f5b193f6707..959508d57dd 100644 > --- a/include/hw/arm/bcm2835_peripherals.h > +++ b/include/hw/arm/bcm2835_peripherals.h > @@ -13,6 +13,7 @@ > > #include "qemu-common.h" > #include "hw/sysbus.h" > +#include "hw/char/pl011.h" > #include "hw/char/bcm2835_aux.h" > #include "hw/display/bcm2835_fb.h" > #include "hw/dma/bcm2835_dma.h" > -- > 2.20.1 > >
diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 6be7660e8cb..7ffb51b6927 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -46,7 +46,7 @@ static void bcm2835_peripherals_init(Object *obj) qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default()); /* UART0 */ - s->uart0 = SYS_BUS_DEVICE(object_new("pl011")); + s->uart0 = SYS_BUS_DEVICE(object_new(TYPE_PL011)); object_property_add_child(obj, "uart0", OBJECT(s->uart0), NULL); qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default()); diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h index f5b193f6707..959508d57dd 100644 --- a/include/hw/arm/bcm2835_peripherals.h +++ b/include/hw/arm/bcm2835_peripherals.h @@ -13,6 +13,7 @@ #include "qemu-common.h" #include "hw/sysbus.h" +#include "hw/char/pl011.h" #include "hw/char/bcm2835_aux.h" #include "hw/display/bcm2835_fb.h" #include "hw/dma/bcm2835_dma.h"
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/arm/bcm2835_peripherals.c | 2 +- include/hw/arm/bcm2835_peripherals.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)