Received: from eggs.gnu.org ([2001:4830:134:3::10]:38855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9x4E-0005Jk-K2 for qemu-devel@nongnu.org; Fri, 18 Dec 2015 10:35:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9x4B-000345-LQ for qemu-devel@nongnu.org; Fri, 18 Dec 2015 10:35:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9x4B-00032i-8v for qemu-devel@nongnu.org; Fri, 18 Dec 2015 10:35:35 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E87633453DC for ; Fri, 18 Dec 2015 15:35:34 +0000 (UTC) From: Markus Armbruster Date: Fri, 18 Dec 2015 16:35:26 +0100 Message-Id: <1450452927-8346-24-git-send-email-armbru@redhat.com> In-Reply-To: <1450452927-8346-1-git-send-email-armbru@redhat.com> References: <1450452927-8346-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 23/24] s390/sclp: Simplify control flow in sclp_realize() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Suggested-by: David Hildenbrand Signed-off-by: Markus Armbruster Reviewed-by: David Hildenbrand Acked-by: Cornelia Huck Reviewed-by: Eric Blake --- 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