mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdev-monitor: Set properties after parent is assigned in device_add

Browse Source 
Test steps:
 (qemu) device_add e1000,addr=adsf
  Property 'e1000.addr' doesn't take value 'adsf'
 (qemu) info qtree
  Then qemu crashed.

Currently we set a link to the new device from its parent bus, but the
device hasn't been added to QOM tree yet. When it fails to set properties,
object_unparent() can't clean up the device.

Delay setting of device properties until the device has been added to
the QOM composition tree. This way, when setting a property fails,
object_unparent() can clean up the device properly.

Signed-off-by: Amos Kong <akong@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Amos Kong 2014-03-03 15:57:55 +08:00 committed by Andreas Färber
parent 267a3264cd
commit 7b0309490c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qdev-monitor.c
View File

@ -522,7 +522,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
return NULL; return NULL;
} }
/* create device, set properties */ /* create device */
dev = DEVICE(object_new(driver)); dev = DEVICE(object_new(driver));
if (bus) { if (bus) {
@ -533,11 +533,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
if (id) { if (id) {
dev->id = id; dev->id = id;
} }
if (qemu_opt_foreach(opts, set_property, dev, 1) != 0) {
object_unparent(OBJECT(dev));
object_unref(OBJECT(dev));
return NULL;
}
if (dev->id) { if (dev->id) {
object_property_add_child(qdev_get_peripheral(), dev->id, object_property_add_child(qdev_get_peripheral(), dev->id,
OBJECT(dev), NULL); OBJECT(dev), NULL);
@ -549,6 +545,13 @@ DeviceState *qdev_device_add(QemuOpts *opts)
g_free(name); g_free(name);
} }
/* set properties */
if (qemu_opt_foreach(opts, set_property, dev, 1) != 0) {
object_unparent(OBJECT(dev));
object_unref(OBJECT(dev));
return NULL;
}
dev->opts = opts; dev->opts = opts;
object_property_set_bool(OBJECT(dev), true, "realized", &err); object_property_set_bool(OBJECT(dev), true, "realized", &err);
if (err != NULL) { if (err != NULL) {