From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTDun-0003UF-VK for qemu-devel@nongnu.org; Mon, 07 Oct 2013 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTDuh-000746-PA for qemu-devel@nongnu.org; Mon, 07 Oct 2013 12:44:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53382 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTDuh-00073q-JF for qemu-devel@nongnu.org; Mon, 07 Oct 2013 12:44:07 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 16F06A5211 for ; Mon, 7 Oct 2013 18:44:07 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 7 Oct 2013 18:44:01 +0200 Message-Id: <1381164241-6566-3-git-send-email-afaerber@suse.de> In-Reply-To: <1381164241-6566-1-git-send-email-afaerber@suse.de> References: <1381164241-6566-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 2/2] qdev-monitor: Inline qdev_init() for device_add List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= For historic reasons, qdev_init() unparents the device on failure. Inline this to make the error paths clearer and consistent. Signed-off-by: Andreas F=C3=A4rber --- qdev-monitor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index f259e07..b7daab7 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -449,6 +449,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) const char *driver, *path, *id; DeviceState *dev; BusState *bus =3D NULL; + Error *err =3D NULL; =20 driver =3D qemu_opt_get(opts, "driver"); if (!driver) { @@ -531,7 +532,11 @@ DeviceState *qdev_device_add(QemuOpts *opts) OBJECT(dev), NULL); g_free(name); } - if (qdev_init(dev) < 0) { + object_property_set_bool(OBJECT(dev), true, "realized", &err); + if (err !=3D NULL) { + qerror_report_err(err); + error_free(err); + object_unparent(OBJECT(dev)); object_unref(OBJECT(dev)); qerror_report(QERR_DEVICE_INIT_FAILED, driver); return NULL; --=20 1.8.1.4