Commit 24da21f2 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

s390/sclp: Simplify control flow in sclp_realize() 



Suggested-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-24-git-send-email-armbru@redhat.com>
parent e6da780d

hw/s390x/sclp.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

}