[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.5 14/15] s390x/ipl: switch error reporting to
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.5 14/15] s390x/ipl: switch error reporting to error_setg |
Date: |
Mon, 9 Nov 2015 16:56:31 +0100 |
From: David Hildenbrand <address@hidden>
Now that we can report errors in the realize function, let's replace
the fprintf's and hw_error's with error_setg.
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/ipl.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index c75071d..b91fcc6 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -76,6 +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;
int bios_size;
char *bios_filename;
@@ -93,7 +94,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (bios_filename == NULL) {
- hw_error("could not find stage1 bootloader\n");
+ error_setg(&l_err, "could not find stage1 bootloader\n");
+ goto error;
}
bios_size = load_elf(bios_filename, bios_translate_addr, &fwbase,
@@ -111,7 +113,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
g_free(bios_filename);
if (bios_size == -1) {
- hw_error("could not load bootloader '%s'\n", bios_name);
+ error_setg(&l_err, "could not load bootloader '%s'\n", bios_name);
+ goto error;
}
/* default boot target is the bios */
@@ -125,8 +128,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
}
if (kernel_size < 0) {
- fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);
- exit(1);
+ error_setg(&l_err, "could not load kernel '%s'\n", ipl->kernel);
+ goto error;
}
/*
* Is it a Linux kernel (starting at 0x10000)? If yes, we fill in the
@@ -153,9 +156,8 @@ 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) {
- fprintf(stderr, "qemu: could not load initrd '%s'\n",
- ipl->initrd);
- exit(1);
+ error_setg(&l_err, "could not load initrd '%s'\n",
ipl->initrd);
+ goto error;
}
/*
@@ -167,6 +169,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
}
}
qemu_register_reset(qdev_reset_all_fn, dev);
+error:
+ error_propagate(errp, l_err);
}
static Property s390_ipl_properties[] = {
--
2.6.3
- [Qemu-devel] [PATCH for-2.5 12/15] qdev: provide qdev_reset_all_fn(), (continued)
- [Qemu-devel] [PATCH for-2.5 12/15] qdev: provide qdev_reset_all_fn(), Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 07/15] pc-bios/s390-ccw: Always adjust virtio sector count, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 11/15] pc-bios/s390-ccw: rebuild image, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 04/15] MAINTAINERS: update virtio-ccw/s390 git tree, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 10/15] pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 09/15] pc-bios/s390-ccw: El Torito s390x boot entry check, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 15/15] s390: deprecate the non-ccw machine in 2.5, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 03/15] MAINTAINERS: update s390 file patterns, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 05/15] s390x: switch to memory_region_allocate_system_memory, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 13/15] s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 14/15] s390x/ipl: switch error reporting to error_setg,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.5 06/15] s390x/kvm: don't enable CMMA when hugetlbfs will be used, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 08/15] pc-bios/s390-ccw: ISO-9660 El Torito boot implementation, Cornelia Huck, 2015/11/09
- Re: [Qemu-devel] [PATCH for-2.5 00/15] s390x patches for 2.5, Christian Borntraeger, 2015/11/11