> On Mon, 14 Dec 2015 10:59:36 +0100 > Markus Armbruster <arm...@redhat.com> 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.
Yes, this looks good to me! Reviewed-by: David Hildenbrand <d...@linux.vnet.ibm.com> Thanks! David