From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaV-0004F4-Ar for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJNaS-0001Cc-7M for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaS-0001CA-0q for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:52 -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 A02E24458A for ; Wed, 13 Jan 2016 15:43:51 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-28.phx2.redhat.com [10.3.113.28]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0DFhnNx019323 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 13 Jan 2016 10:43:51 -0500 From: Markus Armbruster Date: Wed, 13 Jan 2016 16:43:37 +0100 Message-Id: <1452699819-26608-40-git-send-email-armbru@redhat.com> In-Reply-To: <1452699819-26608-1-git-send-email-armbru@redhat.com> References: <1452699819-26608-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 39/41] 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 Message-Id: <1450452927-8346-24-git-send-email-armbru@redhat.com> --- 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