diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-04 18:13:00 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-01-08 21:03:43 +0100 |
| commit | 5d5b24d042072fb4d13e7027f6e52e44390a9896 (patch) | |
| tree | b7bf9690cbf8f55a88f2a78e12d176248a8b6c50 /hw/qdev.c | |
| parent | 507066f8a9610c0088df19ce7b3e436f43165ec1 (diff) | |
| download | focaccia-qemu-5d5b24d042072fb4d13e7027f6e52e44390a9896.tar.gz focaccia-qemu-5d5b24d042072fb4d13e7027f6e52e44390a9896.zip | |
qdev: Don't assume existence of parent bus on unparenting
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>
Diffstat (limited to 'hw/qdev.c')
| -rw-r--r-- | hw/qdev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/qdev.c b/hw/qdev.c index f2c248451c..e2a5c5735b 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -698,16 +698,18 @@ static void device_class_base_init(ObjectClass *class, void *data) klass->props = NULL; } -static void qdev_remove_from_bus(Object *obj) +static void device_unparent(Object *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) { - class->unparent = qdev_remove_from_bus; + class->unparent = device_unparent; } void device_reset(DeviceState *dev) |