falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit ee6abeb6ec)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Stefan Hajnoczi 2013-09-10 18:21:08 +02:00 committed by Michael Roth
parent 2cafbbf1e0
commit 03060dc086
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qdev-monitor.c
View File

@ -518,6 +518,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) {
@ -531,6 +532,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;
} }