qdev-monitor: Unref device when device_add fails
qdev_device_add() leaks the created device upon failure. I suspect this problem crept in because qdev_free() unparents the device but does not drop a reference - confusing name. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
2fa4e56d88
commit
ee6abeb6ec
|
@ -527,6 +527,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
|
||||||
}
|
}
|
||||||
if (qemu_opt_foreach(opts, set_property, qdev, 1) != 0) {
|
if (qemu_opt_foreach(opts, set_property, qdev, 1) != 0) {
|
||||||
qdev_free(qdev);
|
qdev_free(qdev);
|
||||||
|
object_unref(OBJECT(qdev));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (qdev->id) {
|
if (qdev->id) {
|
||||||
|
@ -540,6 +541,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
|
||||||
g_free(name);
|
g_free(name);
|
||||||
}
|
}
|
||||||
if (qdev_init(qdev) < 0) {
|
if (qdev_init(qdev) < 0) {
|
||||||
|
object_unref(OBJECT(qdev));
|
||||||
qerror_report(QERR_DEVICE_INIT_FAILED, driver);
|
qerror_report(QERR_DEVICE_INIT_FAILED, driver);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue