Received: from eggs.gnu.org ([2001:4830:134:3::10]:49941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8QA1-0007Eu-AV for qemu-devel@nongnu.org; Mon, 14 Dec 2015 05:15:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8Q9x-0006sj-7W for qemu-devel@nongnu.org; Mon, 14 Dec 2015 05:15:17 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:51844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8Q9w-0006sR-UD for qemu-devel@nongnu.org; Mon, 14 Dec 2015 05:15:13 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 14 Dec 2015 10:15:09 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6BC3E2190066 for ; Mon, 14 Dec 2015 10:14:57 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tBEAF5ix53149816 for ; Mon, 14 Dec 2015 10:15:05 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tBEAF5uM004008 for ; Mon, 14 Dec 2015 03:15:05 -0700 Date: Mon, 14 Dec 2015 11:15:02 +0100 From: Cornelia Huck Message-ID: <20151214111502.577c4fc1.cornelia.huck@de.ibm.com> In-Reply-To: <878u4xxsdz.fsf@blackfin.pond.sub.org> References: <1449768232-22924-1-git-send-email-armbru@redhat.com> <1449768232-22924-5-git-send-email-armbru@redhat.com> <20151211090741.400fd4ea@thinkpad-w530> <878u4xxsdz.fsf@blackfin.pond.sub.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/4] hw/s390x: Rename local variables Error *l_err to just err List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: David Hildenbrand , qemu-devel@nongnu.org On Mon, 14 Dec 2015 10:59:36 +0100 Markus Armbruster wrote: > Separate patch, like this: > > 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); > } > > If you like it, I'll stick it into my respin. Not speaking for David, but this would get my Ack.