[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/41] s390/sclp: Simplify control flow in sclp_reali
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 39/41] s390/sclp: Simplify control flow in sclp_realize() |
Date: |
Wed, 13 Jan 2016 16:43:37 +0100 |
Suggested-by: David Hildenbrand <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
hw/s390x/sclp.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 9a117c9..74f2b40 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -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);
}
--
2.4.3
- [Qemu-devel] [PULL 29/41] spapr: Use error_reportf_err(), (continued)
- [Qemu-devel] [PULL 29/41] spapr: Use error_reportf_err(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 41/41] checkpatch: Detect newlines in error_report and other error functions, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 33/41] vmdk: Clean up control flow in vmdk_parse_extents() a bit, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 26/41] error: Don't decorate original error message when adding to it, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 32/41] error: Strip trailing '\n' from error string arguments (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 40/41] error: Consistently name Error * objects err, and not errp, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 22/41] block: Clean up "Could not create temporary overlay" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 27/41] error: Use error_reportf_err() where it makes obvious sense, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 30/41] migration: Use error_reportf_err() instead of monitor_printf(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 34/41] vmdk: Clean up "Invalid extent lines" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 39/41] s390/sclp: Simplify control flow in sclp_realize(),
Markus Armbruster <=
- [Qemu-devel] [PULL 37/41] error: Clean up errors with embedded newlines (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 38/41] hw/s390x: Rename local variables Error *l_err to just err, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 04/41] hw: Don't use hw_error() for machine initialization errors, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 31/41] qemu-io qemu-nbd: Use error_report() etc. instead of fprintf(), Markus Armbruster, 2016/01/13
- Re: [Qemu-devel] [PULL 00/41] Error reporting patches for 2016-01-13, Peter Maydell, 2016/01/14