| Message ID | 1453174759-22837-8-git-send-email-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/19/2016 02:39 PM, David Gibson wrote: > 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 <david@gibson.dropbear.id.au> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > 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 f45be7f..3cfacb9 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1781,8 +1781,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); > } > > @@ -1848,10 +1848,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, > @@ -1947,8 +1947,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); > } > > @@ -1964,8 +1965,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); > } > > @@ -1978,8 +1979,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 { >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f45be7f..3cfacb9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1781,8 +1781,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); } @@ -1848,10 +1848,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, @@ -1947,8 +1947,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); } @@ -1964,8 +1965,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); } @@ -1978,8 +1979,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 {
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 <david@gibson.dropbear.id.au> --- hw/ppc/spapr.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)