From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTDuo-0003UG-5D for qemu-devel@nongnu.org; Mon, 07 Oct 2013 12:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTDuh-00074I-Rw for qemu-devel@nongnu.org; Mon, 07 Oct 2013 12:44:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53383 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTDuh-00073p-JD for qemu-devel@nongnu.org; Mon, 07 Oct 2013 12:44:07 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 7 Oct 2013 18:44:00 +0200 Message-Id: <1381164241-6566-2-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 1/2] qdev-monitor: Avoid qdev as variable name 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?= , Stefan Hajnoczi Prepares for bringing error cleanup code into canonical QOM form. Includes a whitespace removal after curly brace by Stefan. Signed-off-by: Stefan Hajnoczi Signed-off-by: Andreas F=C3=A4rber --- qdev-monitor.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 6aa3bb5..f259e07 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -447,7 +447,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) ObjectClass *oc; DeviceClass *dc; const char *driver, *path, *id; - DeviceState *qdev; + DeviceState *dev; BusState *bus =3D NULL; =20 driver =3D qemu_opt_get(opts, "driver"); @@ -506,38 +506,38 @@ DeviceState *qdev_device_add(QemuOpts *opts) } =20 /* create device, set properties */ - qdev =3D DEVICE(object_new(driver)); + dev =3D DEVICE(object_new(driver)); =20 if (bus) { - qdev_set_parent_bus(qdev, bus); + qdev_set_parent_bus(dev, bus); } =20 id =3D qemu_opts_id(opts); if (id) { - qdev->id =3D id; + dev->id =3D id; } - if (qemu_opt_foreach(opts, set_property, qdev, 1) !=3D 0) { - object_unparent(OBJECT(qdev)); - object_unref(OBJECT(qdev)); + if (qemu_opt_foreach(opts, set_property, dev, 1) !=3D 0) { + object_unparent(OBJECT(dev)); + object_unref(OBJECT(dev)); return NULL; } - if (qdev->id) { - object_property_add_child(qdev_get_peripheral(), qdev->id, - OBJECT(qdev), NULL); + if (dev->id) { + object_property_add_child(qdev_get_peripheral(), dev->id, + OBJECT(dev), NULL); } else { static int anon_count; gchar *name =3D g_strdup_printf("device[%d]", anon_count++); object_property_add_child(qdev_get_peripheral_anon(), name, - OBJECT(qdev), NULL); + OBJECT(dev), NULL); g_free(name); - } =20 - if (qdev_init(qdev) < 0) { - object_unref(OBJECT(qdev)); + } + if (qdev_init(dev) < 0) { + object_unref(OBJECT(dev)); qerror_report(QERR_DEVICE_INIT_FAILED, driver); return NULL; } - qdev->opts =3D opts; - return qdev; + dev->opts =3D opts; + return dev; } =20 =20 --=20 1.8.1.4