[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/28] pseries: Clean up error reporting in ppc_spapr
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 17/28] pseries: Clean up error reporting in ppc_spapr_init() |
Date: |
Mon, 25 Jan 2016 12:15:16 +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>
Reviewed-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
hw/ppc/spapr.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b93dc10..4d88a29 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1788,8 +1788,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);
}
@@ -1855,10 +1855,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",
+ error_report("Specified number of memory slots %"
+ PRIu64" exceeds max supported %d",
machine->ram_slots, SPAPR_MAX_RAM_SLOTS);
- exit(EXIT_FAILURE);
+ exit(1);
}
spapr->hotplug_memory.base = ROUND_UP(machine->ram_size,
@@ -1954,8 +1954,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);
}
@@ -1971,8 +1972,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);
}
@@ -1985,8 +1986,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
- Re: [Qemu-devel] [PULL 01/28] target-ppc: Use sensible POWER8/POWER8E versions, (continued)
[Qemu-devel] [PULL 15/28] pseries: Clean up error handling in spapr_rtas_register(), David Gibson, 2016/01/24
[Qemu-devel] [PULL 14/28] pseries: Clean up error handling in spapr_vga_init(), David Gibson, 2016/01/24
[Qemu-devel] [PULL 21/28] target-ppc: gdbstub: fix float registers for little-endian guests, David Gibson, 2016/01/24
[Qemu-devel] [PULL 16/28] pseries: Clean up error handling in xics_system_init(), David Gibson, 2016/01/24
[Qemu-devel] [PULL 27/28] cuda.c: return error for unknown commands, David Gibson, 2016/01/24
[Qemu-devel] [PULL 28/28] uninorth.c: add support for UniNorth kMacRISCPCIAddressSelect (0x48) register, David Gibson, 2016/01/24
[Qemu-devel] [PULL 25/28] target-ppc: gdbstub: Add VSX support, David Gibson, 2016/01/24
[Qemu-devel] [PULL 17/28] pseries: Clean up error reporting in ppc_spapr_init(),
David Gibson <=
[Qemu-devel] [PULL 24/28] target-ppc: gdbstub: fix spe registers for little-endian guests, David Gibson, 2016/01/24
[Qemu-devel] [PULL 22/28] target-ppc: gdbstub: introduce avr_need_swap(), David Gibson, 2016/01/24
[Qemu-devel] [PULL 23/28] target-ppc: gdbstub: fix altivec registers for little-endian guests, David Gibson, 2016/01/24
Re: [Qemu-devel] [PULL 00/28] ppc-for-2.6 queue 20160125, Peter Maydell, 2016/01/25
- Re: [Qemu-devel] [PULL 00/28] ppc-for-2.6 queue 20160125, David Gibson, 2016/01/25
- Re: [Qemu-devel] [PULL 00/28] ppc-for-2.6 queue 20160125, Peter Maydell, 2016/01/25
- Re: [Qemu-devel] [PULL 00/28] ppc-for-2.6 queue 20160125, David Gibson, 2016/01/25
- Re: [Qemu-devel] [PULL 00/28] ppc-for-2.6 queue 20160125, Peter Maydell, 2016/01/25
- Re: [Qemu-devel] [PULL 00/28] ppc-for-2.6 queue 20160125, David Gibson, 2016/01/26
- Re: [Qemu-devel] [PULL 00/28] ppc-for-2.6 queue 20160125, Alexander Graf, 2016/01/26