david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev-monitor: Clean up qdev_device_add() variable naming

Browse Source 
Avoid confusion between object (obj) and object class (oc).
Tidy DeviceClass variable while at it (k -> dc).

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-08-24 01:21:22 +02:00
parent 9c219b7be6
commit f4d8579560
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qdev-monitor.c
View File

@ -453,8 +453,8 @@ static BusState *qbus_find(const char *path)
DeviceState *qdev_device_add(QemuOpts *opts) DeviceState *qdev_device_add(QemuOpts *opts)
{ {
ObjectClass *obj; ObjectClass *oc;
DeviceClass *k; DeviceClass *dc;
const char *driver, *path, *id; const char *driver, *path, *id;
DeviceState *qdev; DeviceState *qdev;
BusState *bus = NULL; BusState *bus = NULL;
@ -466,22 +466,22 @@ DeviceState *qdev_device_add(QemuOpts *opts)
} }
/* find driver */ /* find driver */
obj = object_class_by_name(driver); oc = object_class_by_name(driver);
if (!obj) { if (!oc) {
const char *typename = find_typename_by_alias(driver); const char *typename = find_typename_by_alias(driver);
if (typename) { if (typename) {
driver = 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"); qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", "device type");
return NULL; return NULL;
} }
k = DEVICE_CLASS(obj); dc = DEVICE_CLASS(oc);
/* find bus */ /* find bus */
path = qemu_opt_get(opts, "bus"); path = qemu_opt_get(opts, "bus");
@ -490,16 +490,16 @@ DeviceState *qdev_device_add(QemuOpts *opts)
if (!bus) { if (!bus) {
return NULL; 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, qerror_report(QERR_BAD_BUS_FOR_DEVICE,
driver, object_get_typename(OBJECT(bus))); driver, object_get_typename(OBJECT(bus)));
return NULL; return NULL;
} }
} else if (k->bus_type != NULL) { } else if (dc->bus_type != NULL) {
bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type); bus = qbus_find_recursive(sysbus_get_default(), NULL, dc->bus_type);
if (!bus) { if (!bus) {
qerror_report(QERR_NO_BUS_FOR_DEVICE, qerror_report(QERR_NO_BUS_FOR_DEVICE,
k->bus_type, driver); dc->bus_type, driver);
return NULL; return NULL;
} }
} }