[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 4/4] hw/s390x: Rename local variables Error *l_e
From: |
David Hildenbrand |
Subject: |
Re: [Qemu-devel] [PATCH 4/4] hw/s390x: Rename local variables Error *l_err to just err |
Date: |
Fri, 11 Dec 2015 09:07:41 +0100 |
>
> static Property s390_ipl_properties[] = {
> diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
> index a061b49..9a117c9 100644
> --- a/hw/s390x/sclp.c
> +++ b/hw/s390x/sclp.c
> @@ -456,29 +456,29 @@ static void sclp_realize(DeviceState *dev, Error **errp)
> {
> MachineState *machine = MACHINE(qdev_get_machine());
> SCLPDevice *sclp = SCLP(dev);
> - Error *l_err = NULL;
> + Error *err = NULL;
> uint64_t hw_limit;
> int ret;
>
> object_property_set_bool(OBJECT(sclp->event_facility), true, "realized",
> - &l_err);
> - if (l_err) {
> + &err);
> + if (err) {
> goto error;
> }
>
> ret = s390_set_memory_limit(machine->maxram_size, &hw_limit);
> if (ret == -E2BIG) {
> - error_setg(&l_err, "qemu: host supports a maximum of %" PRIu64 " GB",
> + error_setg(&err, "qemu: host supports a maximum of %" PRIu64 " GB",
> hw_limit >> 30);
> goto error;
> } else if (ret) {
> - error_setg(&l_err, "qemu: setting the guest size failed");
> + error_setg(&err, "qemu: setting the guest size failed");
> goto error;
> }
> return;
> error:
> - assert(l_err);
> - error_propagate(errp, l_err);
> + assert(err);
We could also get rid of that assert and remove the return; above (naming the
label "out").
> + error_propagate(errp, err);
> }
>
> static void sclp_memory_init(SCLPDevice *sclp)
Reviewed-by: David Hildenbrand <address@hidden>
David
[Qemu-devel] [PATCH 3/4] error: Clean up errors with embedded newlines (again), part 2, Markus Armbruster, 2015/12/10
[Qemu-devel] [PATCH 2/4] error: Clean up errors with embedded newlines (again), part 1, Markus Armbruster, 2015/12/10