From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbWEe-0006of-Up for qemu-devel@nongnu.org; Wed, 30 Oct 2013 09:55:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbWEV-0002Xc-JU for qemu-devel@nongnu.org; Wed, 30 Oct 2013 09:55:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbWEV-0002XW-B2 for qemu-devel@nongnu.org; Wed, 30 Oct 2013 09:54:51 -0400 From: Stefan Hajnoczi Date: Wed, 30 Oct 2013 14:54:31 +0100 Message-Id: <1383141276-19230-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1383141276-19230-1-git-send-email-stefanha@redhat.com> References: <1383141276-19230-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/7] qdev: unref qdev when device_add fails List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andreas Faerber , Stefan Hajnoczi , Markus Armbruster 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 --- 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