| Message ID | 1531470464-21522-3-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix crashes with introspection of ARM devices | expand |
On Fri, Jul 13, 2018 at 10:27:30AM +0200, Thomas Huth wrote: > A lot of functions are initializing an object and attach it immediately > afterwards to the system bus. Provide a common function for this, which > also uses object_initialize_child() to make sure that the reference > counter is correctly initialized to 1 afterwards. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > hw/core/sysbus.c | 8 ++++++++ > include/hw/sysbus.h | 3 +++ > 2 files changed, 11 insertions(+) > > diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c > index ecfb0cf..e2436ce 100644 > --- a/hw/core/sysbus.c > +++ b/hw/core/sysbus.c > @@ -376,6 +376,14 @@ BusState *sysbus_get_default(void) > return main_system_bus; > } > > +void sysbus_init_child_obj(Object *parent, const char *childname, void *child, > + size_t childsize, const char *childtype) > +{ > + object_initialize_child(parent, childname, child, childsize, childtype, > + &error_abort); > + qdev_set_parent_bus(DEVICE(child), sysbus_get_default()); > +} > + > static void sysbus_register_types(void) > { > type_register_static(&system_bus_info); > diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h > index e88bb6d..e405232 100644 > --- a/include/hw/sysbus.h > +++ b/include/hw/sysbus.h > @@ -96,6 +96,9 @@ void sysbus_add_io(SysBusDevice *dev, hwaddr addr, > MemoryRegion *mem); > MemoryRegion *sysbus_address_space(SysBusDevice *dev); > > +void sysbus_init_child_obj(Object *parent, const char *childname, void *child, > + size_t childsize, const char *childtype); > + Documentation about the reference ownership rules would be nice, but I don't think this should block the bug fixes. Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index ecfb0cf..e2436ce 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -376,6 +376,14 @@ BusState *sysbus_get_default(void) return main_system_bus; } +void sysbus_init_child_obj(Object *parent, const char *childname, void *child, + size_t childsize, const char *childtype) +{ + object_initialize_child(parent, childname, child, childsize, childtype, + &error_abort); + qdev_set_parent_bus(DEVICE(child), sysbus_get_default()); +} + static void sysbus_register_types(void) { type_register_static(&system_bus_info); diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index e88bb6d..e405232 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -96,6 +96,9 @@ void sysbus_add_io(SysBusDevice *dev, hwaddr addr, MemoryRegion *mem); MemoryRegion *sysbus_address_space(SysBusDevice *dev); +void sysbus_init_child_obj(Object *parent, const char *childname, void *child, + size_t childsize, const char *childtype); + /* Call func for every dynamically created sysbus device in the system */ void foreach_dynamic_sysbus_device(FindSysbusDeviceFunc *func, void *opaque);
A lot of functions are initializing an object and attach it immediately afterwards to the system bus. Provide a common function for this, which also uses object_initialize_child() to make sure that the reference counter is correctly initialized to 1 afterwards. Signed-off-by: Thomas Huth <thuth@redhat.com> --- hw/core/sysbus.c | 8 ++++++++ include/hw/sysbus.h | 3 +++ 2 files changed, 11 insertions(+)