Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 19:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/s390x: Rename local variables Error *l_err to just err

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:25 +01:00
parent 433672b0d5
commit e6da780d5f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/s390x/ipl.c
View File

@ -76,7 +76,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
S390IPLState *ipl = S390_IPL(dev); S390IPLState *ipl = S390_IPL(dev);
uint64_t pentry = KERN_IMAGE_START; uint64_t pentry = KERN_IMAGE_START;
int kernel_size; int kernel_size;
Error *l_err = NULL; Error *err = NULL;
int bios_size; int bios_size;
char *bios_filename; 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); bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (bios_filename == NULL) { if (bios_filename == NULL) {
error_setg(&l_err, "could not find stage1 bootloader"); error_setg(&err, "could not find stage1 bootloader");
goto error; goto error;
} }
@ -113,7 +113,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
g_free(bios_filename); g_free(bios_filename);
if (bios_size == -1) { 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; 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); kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
} }
if (kernel_size < 0) { 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; goto error;
} }
/* /*
@ -156,7 +156,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
initrd_size = load_image_targphys(ipl->initrd, initrd_offset, initrd_size = load_image_targphys(ipl->initrd, initrd_offset,
ram_size - initrd_offset); ram_size - initrd_offset);
if (initrd_size == -1) { 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; goto error;
} }
@ -170,7 +170,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
} }
qemu_register_reset(qdev_reset_all_fn, dev); qemu_register_reset(qdev_reset_all_fn, dev);
error: error:
error_propagate(errp, l_err); error_propagate(errp, err);
} }
static Property s390_ipl_properties[] = { static Property s390_ipl_properties[] = {

14
hw/s390x/sclp.c
View File

@ -456,29 +456,29 @@ static void sclp_realize(DeviceState *dev, Error **errp)
{ {
MachineState *machine = MACHINE(qdev_get_machine()); MachineState *machine = MACHINE(qdev_get_machine());
SCLPDevice *sclp = SCLP(dev); SCLPDevice *sclp = SCLP(dev);
Error *l_err = NULL; Error *err = NULL;
uint64_t hw_limit; uint64_t hw_limit;
int ret; int ret;
object_property_set_bool(OBJECT(sclp->event_facility), true, "realized", object_property_set_bool(OBJECT(sclp->event_facility), true, "realized",
&l_err); &err);
if (l_err) { if (err) {
goto error; goto error;
} }
ret = s390_set_memory_limit(machine->maxram_size, &hw_limit); ret = s390_set_memory_limit(machine->maxram_size, &hw_limit);
if (ret == -E2BIG) { 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); hw_limit >> 30);
goto error; goto error;
} else if (ret) { } else if (ret) {
error_setg(&l_err, "qemu: setting the guest size failed"); error_setg(&err, "qemu: setting the guest size failed");
goto error; goto error;
} }
return; return;
error: error:
assert(l_err); assert(err);
error_propagate(errp, l_err); error_propagate(errp, err);
} }
static void sclp_memory_init(SCLPDevice *sclp) static void sclp_memory_init(SCLPDevice *sclp)