OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qom: Use returned bool to check for failure, manual part

Browse Source 
The previous commit used Coccinelle to convert from checking the Error
object to checking the return value.  Convert a few more manually.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-30-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-07-07 18:05:57 +02:00
parent 778a2dc592
commit f07ad48d46
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/core/bus.c
View File

@ -166,11 +166,7 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam
bool qbus_realize(BusState *bus, Error **errp)
{
Error *err = NULL;
object_property_set_bool(OBJECT(bus), "realized", true, &err);
error_propagate(errp, err);
return !err;
return object_property_set_bool(OBJECT(bus), "realized", true, errp);
}
void qbus_unrealize(BusState *bus)

7
hw/core/qdev.c
View File

@ -388,8 +388,6 @@ void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
*/
bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)
{
Error *err = NULL;
assert(!dev->realized && !dev->parent_bus);
if (bus) {
@ -398,10 +396,7 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)
assert(!DEVICE_GET_CLASS(dev)->bus_type);
}
if (!object_property_set_bool(OBJECT(dev), "realized", true, &err)) {
error_propagate(errp, err);
}
return !err;
return object_property_set_bool(OBJECT(dev), "realized", true, errp);
}
/*

11
hw/s390x/s390-virtio-ccw.c
View File

@ -69,19 +69,20 @@ static S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id,
{
S390CPU *cpu = S390_CPU(object_new(typename));
Error *err = NULL;
S390CPU *ret = NULL;
if (!object_property_set_int(OBJECT(cpu), "core-id", core_id, &err)) {
goto out;
}
qdev_realize(DEVICE(cpu), NULL, &err);
if (!qdev_realize(DEVICE(cpu), NULL, &err)) {
goto out;
}
ret = cpu;
out:
object_unref(OBJECT(cpu));
if (err) {
error_propagate(errp, err);
cpu = NULL;
}
return cpu;
return ret;
}
static void s390_init_cpus(MachineState *machine)