david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: Don't assume existence of parent bus on unparenting

Browse Source 
Commit 667d22d1ae59da46b4c1fbd094ca61145f19b8c3 (qdev: move bus removal
to object_unparent) made the assumption that at unparenting time
parent_bus is not NULL. This assumption is unjustified since
object_unparent() may well be called directly after object_initialize(),
without any qdev_set_parent_bus().

This did not cause any issues yet because qdev_[try_]create() does call
qdev_set_parent_bus(), falling back to SysBus if unsupplied.

While at it, ensure that this new function uses the device_ prefix and
make the name more neutral in light of this semantic change.

Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Tested-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
Andreas Färber 2013-01-04 18:13:00 +01:00
parent 507066f8a9
commit 5d5b24d042
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/qdev.c
View File

@ -698,16 +698,18 @@ static void device_class_base_init(ObjectClass *class, void *data)
klass->props = NULL; klass->props = NULL;
} }
static void qdev_remove_from_bus(Object *obj) static void device_unparent(Object *obj)
{ {
DeviceState *dev = DEVICE(obj); DeviceState *dev = DEVICE(obj);
bus_remove_child(dev->parent_bus, dev); if (dev->parent_bus != NULL) {
bus_remove_child(dev->parent_bus, dev);
}
} }
static void device_class_init(ObjectClass *class, void *data) static void device_class_init(ObjectClass *class, void *data)
{ {
class->unparent = qdev_remove_from_bus; class->unparent = device_unparent;
} }
void device_reset(DeviceState *dev) void device_reset(DeviceState *dev)