diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-12-18 16:35:25 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 15:16:19 +0100 |
| commit | e6da780d5f8e258f4a97631612d2b841faed4885 (patch) | |
| tree | d858722add64dba4fed5f3bff524b8b8a48a9dd8 /hw/s390x/ipl.c | |
| parent | 433672b0d5cfdd4acbf269e6aef079e162af5bad (diff) | |
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/ipl.c')
| -rw-r--r-- | hw/s390x/ipl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index e100428f20..9c01be5ca9 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[] = { |