[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 23/24] s390/sclp: Simplify control flow in sclp_r
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 23/24] s390/sclp: Simplify control flow in sclp_realize() |
Date: |
Fri, 18 Dec 2015 16:35:26 +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>
---
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] [PATCH v3 22/24] hw/s390x: Rename local variables Error *l_err to just err, (continued)
- [Qemu-devel] [PATCH v3 22/24] hw/s390x: Rename local variables Error *l_err to just err, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 05/24] error: Improve documentation, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 24/24] error: Consistently name Error * objects err, and not errp, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 11/24] error: Use error_reportf_err() where it makes obvious sense, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 21/24] error: Clean up errors with embedded newlines (again), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 20/24] vhdx: Fix "log that needs to be replayed" error message, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 23/24] s390/sclp: Simplify control flow in sclp_realize(),
Markus Armbruster <=