From patchwork Fri Dec 18 15:35:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 559022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9799D14031D for ; Sat, 19 Dec 2015 04:21:25 +1100 (AEDT) Received: from localhost ([::1]:34154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9yiY-0005kd-Dm for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2015 12:21:22 -0500 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) Received: from blackfin.pond.sub.org (ovpn-113-44.phx2.redhat.com [10.3.113.44]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBIFZXe1000575 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 18 Dec 2015 10:35:34 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0E420300BD75; Fri, 18 Dec 2015 16:35:29 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 23/24] s390/sclp: Simplify control flow in sclp_realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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); }