From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDrbl-0000J3-GY for qemu-devel@nongnu.org; Mon, 26 Aug 2013 03:53:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VDrbd-0002Xt-7t for qemu-devel@nongnu.org; Mon, 26 Aug 2013 03:53:05 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:51092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDrbb-0002XE-9e for qemu-devel@nongnu.org; Mon, 26 Aug 2013 03:52:57 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 26 Aug 2013 13:13:39 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 2C4C4E004F for ; Mon, 26 Aug 2013 13:23:21 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7Q7sLhC44630128 for ; Mon, 26 Aug 2013 13:24:22 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r7Q7qjFx017160 for ; Mon, 26 Aug 2013 13:22:45 +0530 Message-ID: <521B0925.6080300@linux.vnet.ibm.com> Date: Mon, 26 Aug 2013 15:52:05 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1377302436-25193-1-git-send-email-afaerber@suse.de> <1377302436-25193-16-git-send-email-afaerber@suse.de> In-Reply-To: <1377302436-25193-16-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 15/16] qdev-monitor: Clean up qdev_device_add() variable naming List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, anthony@codemonkey.ws 于 2013-8-24 8:00, Andreas Färber 写道: > Avoid confusion between object and object class. between object class and device class? > Tidy DeviceClass variable while at it. > > Signed-off-by: Andreas Färber > --- > qdev-monitor.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/qdev-monitor.c b/qdev-monitor.c > index 410cdcb..51bfec0 100644 > --- a/qdev-monitor.c > +++ b/qdev-monitor.c > @@ -444,8 +444,8 @@ static BusState *qbus_find(const char *path) > > DeviceState *qdev_device_add(QemuOpts *opts) > { > - ObjectClass *obj; > - DeviceClass *k; > + ObjectClass *oc; > + DeviceClass *dc; > const char *driver, *path, *id; > DeviceState *qdev; > BusState *bus = NULL; > @@ -457,22 +457,22 @@ DeviceState *qdev_device_add(QemuOpts *opts) > } > > /* find driver */ > - obj = object_class_by_name(driver); > - if (!obj) { > + oc = object_class_by_name(driver); > + if (!oc) { > const char *typename = find_typename_by_alias(driver); > > if (typename) { > driver = typename; > - obj = object_class_by_name(driver); > + oc = object_class_by_name(driver); > } > } > > - if (!obj) { > + if (!oc) { > qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", "device type"); > return NULL; > } > > - k = DEVICE_CLASS(obj); > + dc = DEVICE_CLASS(oc); > > /* find bus */ > path = qemu_opt_get(opts, "bus"); > @@ -481,16 +481,16 @@ DeviceState *qdev_device_add(QemuOpts *opts) > if (!bus) { > return NULL; > } > - if (!object_dynamic_cast(OBJECT(bus), k->bus_type)) { > + if (!object_dynamic_cast(OBJECT(bus), dc->bus_type)) { > qerror_report(QERR_BAD_BUS_FOR_DEVICE, > driver, object_get_typename(OBJECT(bus))); > return NULL; > } > - } else if (k->bus_type != NULL) { > - bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type); > + } else if (dc->bus_type != NULL) { > + bus = qbus_find_recursive(sysbus_get_default(), NULL, dc->bus_type); > if (!bus) { > qerror_report(QERR_NO_BUS_FOR_DEVICE, > - k->bus_type, driver); > + dc->bus_type, driver); > return NULL; > } > } > -- Best Regards Wenchao Xia