[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/16] qdev-monitor: Clean up qdev_device_add() vari
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 15/16] qdev-monitor: Clean up qdev_device_add() variable naming |
Date: |
Sat, 24 Aug 2013 02:00:35 +0200 |
Avoid confusion between object and object class.
Tidy DeviceClass variable while at it.
Signed-off-by: Andreas Färber <address@hidden>
---
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;
}
}
--
1.8.1.4
- Re: [Qemu-devel] [PATCH 12/16] qdev: Pass size to qbus_create_inplace(), (continued)
- [Qemu-devel] [PATCH 14/16] qom: Introduce type_get_instance_size(), Andreas Färber, 2013/08/23
- [Qemu-devel] [PATCH 13/16] qom: Pass available size to object_initialize(), Andreas Färber, 2013/08/23
- [Qemu-devel] [PATCH 16/16] qdev-monitor: Avoid aborting on out-of-memory in qdev_device_add(), Andreas Färber, 2013/08/23
- [Qemu-devel] [PATCH 15/16] qdev-monitor: Clean up qdev_device_add() variable naming,
Andreas Färber <=
- Re: [Qemu-devel] [PATCH 00/16] qom: Assert sufficient object instance size, Wenchao Xia, 2013/08/26
- Re: [Qemu-devel] [PATCH 00/16] qom: Assert sufficient object instance size, Andreas Färber, 2013/08/30