[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] pseries: Clean up error reporting in ppc_spap
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 09/10] pseries: Clean up error reporting in ppc_spapr_init() |
Date: |
Fri, 15 Jan 2016 23:00:43 +1100 |
This function includes a number of explicit fprintf()s for errors.
Change these to use error_report() instead.
Also replace the single exit(EXIT_FAILURE) with an explicit exit(1), since
the latter is the more usual idiom in qemu by a large margin.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 8e02ae8..9f3d590 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1791,8 +1791,8 @@ static void ppc_spapr_init(MachineState *machine)
}
if (spapr->rma_size > node0_size) {
- fprintf(stderr, "Error: Numa node 0 has to span the RMA
(%#08"HWADDR_PRIx")\n",
- spapr->rma_size);
+ error_report("Numa node 0 has to span the RMA (%#08"HWADDR_PRIx")",
+ spapr->rma_size);
exit(1);
}
@@ -1858,10 +1858,10 @@ static void ppc_spapr_init(MachineState *machine)
ram_addr_t hotplug_mem_size = machine->maxram_size - machine->ram_size;
if (machine->ram_slots > SPAPR_MAX_RAM_SLOTS) {
- error_report("Specified number of memory slots %" PRIu64
- " exceeds max supported %d",
- machine->ram_slots, SPAPR_MAX_RAM_SLOTS);
- exit(EXIT_FAILURE);
+ error_report("Specified number of memory slots %"
+ PRIu64" exceeds max supported %d",
+ machine->ram_slots, SPAPR_MAX_RAM_SLOTS);
+ exit(1);
}
spapr->hotplug_memory.base = ROUND_UP(machine->ram_size,
@@ -1957,8 +1957,9 @@ static void ppc_spapr_init(MachineState *machine)
}
if (spapr->rma_size < (MIN_RMA_SLOF << 20)) {
- fprintf(stderr, "qemu: pSeries SLOF firmware requires >= "
- "%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF);
+ error_report(
+ "pSeries SLOF firmware requires >= %ldM guest RMA (Real Mode Area
memory)",
+ MIN_RMA_SLOF);
exit(1);
}
@@ -1974,8 +1975,8 @@ static void ppc_spapr_init(MachineState *machine)
kernel_le = kernel_size > 0;
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: error loading %s: %s\n",
- kernel_filename, load_elf_strerror(kernel_size));
+ error_report("error loading %s: %s",
+ kernel_filename, load_elf_strerror(kernel_size));
exit(1);
}
@@ -1988,8 +1989,8 @@ static void ppc_spapr_init(MachineState *machine)
initrd_size = load_image_targphys(initrd_filename, initrd_base,
load_limit - initrd_base);
if (initrd_size < 0) {
- fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
- initrd_filename);
+ error_report("could not load initial ram disk '%s'",
+ initrd_filename);
exit(1);
}
} else {
--
2.5.0
- [Qemu-devel] [PATCH 06/10] pseries: Improve error handling in find_unknown_sysbus_device(), (continued)
- [Qemu-devel] [PATCH 06/10] pseries: Improve error handling in find_unknown_sysbus_device(), David Gibson, 2016/01/15
- [Qemu-devel] [PATCH 08/10] pseries: Clean up error handling in xics_system_init(), David Gibson, 2016/01/15
- [Qemu-devel] [PATCH 10/10] pseries: Clean up error reporting in htab migration functions, David Gibson, 2016/01/15
- [Qemu-devel] [PATCH 04/10] pseries: Clean up error handling in spapr_validate_node_memory(), David Gibson, 2016/01/15
- [Qemu-devel] [PATCH 01/10] ppc: Cleanup error handling in ppc_set_compat(), David Gibson, 2016/01/15
- [Qemu-devel] [PATCH 02/10] pseries: Cleanup error handling of spapr_cpu_init(), David Gibson, 2016/01/15
- [Qemu-devel] [PATCH 09/10] pseries: Clean up error reporting in ppc_spapr_init(),
David Gibson <=
- Re: [Qemu-devel] [PATCH 00/10] Cleanups to error reporting on ppc and spapr (v2), Markus Armbruster, 2016/01/15