[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/41] hw/s390x: Rename local variables Error *l_err
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 38/41] hw/s390x: Rename local variables Error *l_err to just err |
Date: |
Wed, 13 Jan 2016 16:43:36 +0100 |
Let's follow established naming practice here as well.
Cc: David Hildenbrand <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
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
- [Qemu-devel] [PULL 33/41] vmdk: Clean up control flow in vmdk_parse_extents() a bit, (continued)
- [Qemu-devel] [PULL 33/41] vmdk: Clean up control flow in vmdk_parse_extents() a bit, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 26/41] error: Don't decorate original error message when adding to it, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 32/41] error: Strip trailing '\n' from error string arguments (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 40/41] error: Consistently name Error * objects err, and not errp, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 22/41] block: Clean up "Could not create temporary overlay" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 27/41] error: Use error_reportf_err() where it makes obvious sense, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 30/41] migration: Use error_reportf_err() instead of monitor_printf(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 34/41] vmdk: Clean up "Invalid extent lines" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 39/41] s390/sclp: Simplify control flow in sclp_realize(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 37/41] error: Clean up errors with embedded newlines (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 38/41] hw/s390x: Rename local variables Error *l_err to just err,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/41] hw: Don't use hw_error() for machine initialization errors, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 31/41] qemu-io qemu-nbd: Use error_report() etc. instead of fprintf(), Markus Armbruster, 2016/01/13
- Re: [Qemu-devel] [PULL 00/41] Error reporting patches for 2016-01-13, Peter Maydell, 2016/01/14