From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bkt-0003yj-SI for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9bks-0007aa-1a for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bkr-0007a1-Pg for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:13 -0500 From: Markus Armbruster Date: Thu, 17 Dec 2015 17:50:03 +0100 Message-Id: <1450371004-26866-23-git-send-email-armbru@redhat.com> In-Reply-To: <1450371004-26866-1-git-send-email-armbru@redhat.com> References: <1450371004-26866-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 22/23] hw/s390x: Rename local variables Error *l_err to just err List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Hildenbrand , Markus Armbruster Let's follow established naming practice here as well. Cc: David Hildenbrand Signed-off-by: Markus Armbruster Acked-by: Cornelia Huck Reviewed-by: David Hildenbrand --- hw/s390x/ipl.c | 12 ++++++------ hw/s390x/sclp.c | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index e100428..9c01be5 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -76,7 +76,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) S390IPLState *ipl = S390_IPL(dev); uint64_t pentry = KERN_IMAGE_START; int kernel_size; - Error *l_err = NULL; + Error *err = NULL; int bios_size; char *bios_filename; @@ -94,7 +94,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (bios_filename == NULL) { - error_setg(&l_err, "could not find stage1 bootloader"); + error_setg(&err, "could not find stage1 bootloader"); goto error; } @@ -113,7 +113,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) g_free(bios_filename); if (bios_size == -1) { - error_setg(&l_err, "could not load bootloader '%s'", bios_name); + error_setg(&err, "could not load bootloader '%s'", bios_name); goto error; } @@ -128,7 +128,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) kernel_size = load_image_targphys(ipl->kernel, 0, ram_size); } if (kernel_size < 0) { - error_setg(&l_err, "could not load kernel '%s'", ipl->kernel); + error_setg(&err, "could not load kernel '%s'", ipl->kernel); goto error; } /* @@ -156,7 +156,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) initrd_size = load_image_targphys(ipl->initrd, initrd_offset, ram_size - initrd_offset); if (initrd_size == -1) { - error_setg(&l_err, "could not load initrd '%s'", ipl->initrd); + error_setg(&err, "could not load initrd '%s'", ipl->initrd); goto error; } @@ -170,7 +170,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) } qemu_register_reset(qdev_reset_all_fn, dev); error: - error_propagate(errp, l_err); + error_propagate(errp, err); } 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); + error_propagate(errp, err); } static void sclp_memory_init(SCLPDevice *sclp) -- 2.4.3