Re: [Qemu-devel] [PATCH 4/4] hw/s390x: Rename local variables Error *l_err to just err

[Markus Armbruster]

David Hildenbrand <address@hidden> writes:

>> 
>>  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").

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.

>> +    error_propagate(errp, err);
>>  }
>> 
>>  static void sclp_memory_init(SCLPDevice *sclp)
>
> Reviewed-by: David Hildenbrand <address@hidden>

Thanks!