mirror of
https://github.com/qemu/qemu.git
synced 2024-11-28 14:24:02 +08:00
s390/sclp: Simplify control flow in sclp_realize()
Suggested-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1450452927-8346-24-git-send-email-armbru@redhat.com>
This commit is contained in:
parent
e6da780d5f
commit
24da21f265
@ -463,21 +463,18 @@ static void sclp_realize(DeviceState *dev, Error **errp)
|
||||
object_property_set_bool(OBJECT(sclp->event_facility), true, "realized",
|
||||
&err);
|
||||
if (err) {
|
||||
goto error;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = s390_set_memory_limit(machine->maxram_size, &hw_limit);
|
||||
if (ret == -E2BIG) {
|
||||
error_setg(&err, "qemu: host supports a maximum of %" PRIu64 " GB",
|
||||
hw_limit >> 30);
|
||||
goto error;
|
||||
} else if (ret) {
|
||||
error_setg(&err, "qemu: setting the guest size failed");
|
||||
goto error;
|
||||
}
|
||||
return;
|
||||
error:
|
||||
assert(err);
|
||||
|
||||
out:
|
||||
error_propagate(errp, err);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user