[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/7] qdev: unref qdev when device_add fails
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 2/7] qdev: unref qdev when device_add fails |
Date: |
Wed, 30 Oct 2013 14:54:31 +0100 |
qdev_device_add() leaks the created qdev upon failure. I suspect this
problem crept in because qdev_free() unparents the qdev but does not
drop a reference - confusing name.
Also drop trailing whitespace after curly bracket.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qdev-monitor.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index a02c925..0cb53a5 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -521,6 +521,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
}
if (qemu_opt_foreach(opts, set_property, qdev, 1) != 0) {
qdev_free(qdev);
+ object_unref(OBJECT(qdev));
return NULL;
}
if (qdev->id) {
@@ -532,8 +533,9 @@ DeviceState *qdev_device_add(QemuOpts *opts)
object_property_add_child(qdev_get_peripheral_anon(), name,
OBJECT(qdev), NULL);
g_free(name);
- }
+ }
if (qdev_init(qdev) < 0) {
+ object_unref(OBJECT(qdev));
qerror_report(QERR_DEVICE_INIT_FAILED, driver);
return NULL;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v3 0/7] qdev and blockdev refcount leak fixes, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 3/7] libqtest: rename qmp() to qmp_discard_response(), Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 2/7] qdev: unref qdev when device_add fails,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 4/7] libqtest: add qmp(fmt, ...) -> QDict* function, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 1/7] blockdev: fix drive_init() opts and bs_opts leaks, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 5/7] blockdev-test: add test case for drive_add duplicate IDs, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 6/7] qdev-monitor-test: add device_add leak test cases, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 7/7] qdev: drop misleading qdev_free() function, Stefan Hajnoczi, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 0/7] qdev and blockdev refcount leak fixes, Andreas Färber, 2013/10/30