From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJQh4-0008FF-Kj for qemu-devel@nongnu.org; Tue, 10 Sep 2013 12:21:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJQgx-0002Ng-D8 for qemu-devel@nongnu.org; Tue, 10 Sep 2013 12:21:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJQgx-0002Na-4t for qemu-devel@nongnu.org; Tue, 10 Sep 2013 12:21:27 -0400 From: Stefan Hajnoczi Date: Tue, 10 Sep 2013 18:21:08 +0200 Message-Id: <1378830072-28926-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1378830072-28926-1-git-send-email-stefanha@redhat.com> References: <1378830072-28926-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] 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: Anthony Liguori , Michael Tokarev , Markus Armbruster , Stefan Hajnoczi , Paolo Bonzini , Andreas Faerber 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 410cdcb..5657cdc 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -512,6 +512,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) { @@ -523,8 +524,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