ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pseries: Clean up error handling in spapr_validate_node_memory() 

Use error_setg() and return an error, rather than using an explicit exit().

Also improve messages, and be more explicit about which constraint failed.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
David Gibson 2016-01-25 22:46:47 +11:00
parent 569f49671d
commit 7c150d6f04
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/ppc/spapr.c
View File

@ -1699,27 +1699,34 @@ static void spapr_create_lmb_dr_connectors(sPAPRMachineState *spapr)
* to SPAPR_MEMORY_BLOCK_SIZE(256MB), then refuse to start the guest * to SPAPR_MEMORY_BLOCK_SIZE(256MB), then refuse to start the guest
* since we can't support such unaligned sizes with DRCONF_MEMORY. * since we can't support such unaligned sizes with DRCONF_MEMORY.
*/ */
static void spapr_validate_node_memory(MachineState *machine) static void spapr_validate_node_memory(MachineState *machine, Error **errp)
{ {
int i; int i;
if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE || if (machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) {
machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Memory size 0x" RAM_ADDR_FMT
error_report("Can't support memory configuration where RAM size " " is not aligned to %llu MiB",
"0x" RAM_ADDR_FMT " or maxmem size " machine->ram_size,
"0x" RAM_ADDR_FMT " isn't aligned to %llu MB", SPAPR_MEMORY_BLOCK_SIZE / M_BYTE);
machine->ram_size, machine->maxram_size, return;
SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); }
exit(EXIT_FAILURE);
if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE) {
error_setg(errp, "Maximum memory size 0x" RAM_ADDR_FMT
" is not aligned to %llu MiB",
machine->ram_size,
SPAPR_MEMORY_BLOCK_SIZE / M_BYTE);
return;
} }
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
if (numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { if (numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) {
error_report("Can't support memory configuration where memory size" error_setg(errp,
" %" PRIx64 " of node %d isn't aligned to %llu MB", "Node %d memory size 0x%" PRIx64
numa_info[i].node_mem, i, " is not aligned to %llu MiB",
SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); i, numa_info[i].node_mem,
exit(EXIT_FAILURE); SPAPR_MEMORY_BLOCK_SIZE / M_BYTE);
return;
} }
} }
} }
@ -1809,7 +1816,7 @@ static void ppc_spapr_init(MachineState *machine)
XICS_IRQS); XICS_IRQS);
if (smc->dr_lmb_enabled) { if (smc->dr_lmb_enabled) {
spapr_validate_node_memory(machine); spapr_validate_node_memory(machine, &error_fatal);
} }
/* init CPUs */ /* init CPUs */