From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNxd-0003Ga-SZ for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:32:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLNxc-0003FM-NO for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:32:05 -0500 Received: from mail-pf0-x232.google.com ([2607:f8b0:400e:c00::232]:33158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNxc-0003F9-F6 for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:32:04 -0500 Received: by mail-pf0-x232.google.com with SMTP id e65so168842504pfe.0 for ; Mon, 18 Jan 2016 20:32:04 -0800 (PST) References: <1453174759-22837-1-git-send-email-david@gibson.dropbear.id.au> <1453174759-22837-4-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <569DBC3E.6080302@ozlabs.ru> Date: Tue, 19 Jan 2016 15:31:58 +1100 MIME-Version: 1.0 In-Reply-To: <1453174759-22837-4-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv4 3/8] pseries: Clean up error handling in spapr_validate_node_memory() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , armbru@redhat.com, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 01/19/2016 02:39 PM, David Gibson wrote: > 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 > Reviewed-by: Bharata B Rao > Reviewed-by: Thomas Huth Reviewed-by: Alexey Kardashevskiy > --- > hw/ppc/spapr.c | 37 ++++++++++++++++++++++--------------- > 1 file changed, 22 insertions(+), 15 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index b7fd09a..fb0e254 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1691,27 +1691,34 @@ static void spapr_create_lmb_dr_connectors(sPAPRMachineState *spapr) > * to SPAPR_MEMORY_BLOCK_SIZE(256MB), then refuse to start the guest > * 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; > > - if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE || > - machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { > - error_report("Can't support memory configuration where RAM size " > - "0x" RAM_ADDR_FMT " or maxmem size " > - "0x" RAM_ADDR_FMT " isn't aligned to %llu MB", > - machine->ram_size, machine->maxram_size, > - SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); > - exit(EXIT_FAILURE); > + if (machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { > + error_setg(errp, "Memory size 0x" RAM_ADDR_FMT > + " is not aligned to %llu MiB", > + machine->ram_size, > + SPAPR_MEMORY_BLOCK_SIZE / M_BYTE); > + return; > + } > + > + 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++) { > if (numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { > - error_report("Can't support memory configuration where memory size" > - " %" PRIx64 " of node %d isn't aligned to %llu MB", > - numa_info[i].node_mem, i, > - SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); > - exit(EXIT_FAILURE); > + error_setg(errp, > + "Node %d memory size 0x" RAM_ADDR_FMT > + " is not aligned to %llu MiB", > + i, numa_info[i].node_mem, > + SPAPR_MEMORY_BLOCK_SIZE / M_BYTE); > + return; > } > } > } > @@ -1801,7 +1808,7 @@ static void ppc_spapr_init(MachineState *machine) > XICS_IRQS); > > if (smc->dr_lmb_enabled) { > - spapr_validate_node_memory(machine); > + spapr_validate_node_memory(machine, &error_fatal); > } > > /* init CPUs */ > -- Alexey