aboutsummaryrefslogtreecommitdiff
path: root/hw/s390x/sclp.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-12-18 16:35:25 +0100
committerMarkus Armbruster <armbru@redhat.com>2016-01-13 15:16:19 +0100
commite6da780d5f8e258f4a97631612d2b841faed4885 (patch)
treed858722add64dba4fed5f3bff524b8b8a48a9dd8 /hw/s390x/sclp.c
parent433672b0d5cfdd4acbf269e6aef079e162af5bad (diff)
downloadqemu-e6da780d5f8e258f4a97631612d2b841faed4885.zip
qemu-e6da780d5f8e258f4a97631612d2b841faed4885.tar.gz
qemu-e6da780d5f8e258f4a97631612d2b841faed4885.tar.bz2
hw/s390x: Rename local variables Error *l_err to just err
Let's follow established naming practice here as well. Cc: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Markus Armbruster <armbru@pond.sub.org> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1450452927-8346-23-git-send-email-armbru@redhat.com>
Diffstat (limited to 'hw/s390x/sclp.c')
-rw-r--r--hw/s390x/sclp.c14
1 files changed, 7 insertions, 7 deletions
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);
+ error_propagate(errp, err);
}
static void sclp_memory_init(SCLPDevice *sclp)