mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
qom: Use returned bool to check for failure, manual part
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:
parent
778a2dc592
commit
f07ad48d46
3 changed files with 9 additions and 17 deletions
|
@ -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;
|
||||
error_propagate(errp, err);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void s390_init_cpus(MachineState *machine)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue