haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qdev-monitor: Avoid qdev as variable name

Browse source 
Prepares for bringing error cleanup code into canonical QOM form.

Includes a whitespace removal after curly brace by Stefan.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-10-07 16:17:54 +02:00
parent 02a5c4c974
commit 2bcb0c62f6
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
qdev-monitor.c
View file

@ -456,7 +456,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
ObjectClass *oc;
DeviceClass *dc;
const char *driver, *path, *id;
DeviceState *qdev;
DeviceState *dev;
BusState *bus = NULL;
driver = qemu_opt_get(opts, "driver");
@ -515,38 +515,38 @@ DeviceState *qdev_device_add(QemuOpts *opts)
}
/* create device, set properties */
qdev = DEVICE(object_new(driver));
dev = DEVICE(object_new(driver));
if (bus) {
qdev_set_parent_bus(qdev, bus);
qdev_set_parent_bus(dev, bus);
}
id = qemu_opts_id(opts);
if (id) {
qdev->id = id;
dev->id = id;
}
if (qemu_opt_foreach(opts, set_property, qdev, 1) != 0) {
object_unparent(OBJECT(qdev));
object_unref(OBJECT(qdev));
if (qemu_opt_foreach(opts, set_property, dev, 1) != 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 = 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);
}
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 = opts;
return qdev;
dev->opts = opts;
return dev;
}