From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwbsa-0005YY-TL for qemu-devel@nongnu.org; Mon, 16 Jun 2014 14:43:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwbsL-0001Hm-Mv for qemu-devel@nongnu.org; Mon, 16 Jun 2014 14:43:40 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:58588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwbsL-0001Hb-Eg for qemu-devel@nongnu.org; Mon, 16 Jun 2014 14:43:25 -0400 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Jun 2014 12:43:24 -0600 Date: Mon, 16 Jun 2014 11:43:00 -0700 From: Nishanth Aravamudan Message-ID: <20140616184300.GG16644@linux.vnet.ibm.com> References: <1402905233-26510-1-git-send-email-aik@ozlabs.ru> <1402905233-26510-6-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1402905233-26510-6-git-send-email-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH 5/7] spapr: Add a helper for node0_size calculation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf On 16.06.2014 [17:53:51 +1000], Alexey Kardashevskiy wrote: > In multiple places there is a node0_size variable calculation > which assumes that NUMA node #0 and memory node #0 are the same > things which they are not. Since we are going to change it and > do not want to change it in multiple places, let's make a helper. > > This adds a spapr_node0_size() helper and makes use of it. > > Signed-off-by: Alexey Kardashevskiy > --- > hw/ppc/spapr.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 10202e2..00ef7a1 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -351,6 +351,20 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop, > return (p - prop) * sizeof(uint32_t); > } > > +static hwaddr spapr_node0_size(void) > +{ > + if (nb_numa_nodes > 1) { > + int i; > + for (i = 0; i < nb_numa_nodes; ++i) { > + if (node_mem[i]) { > + return MIN(pow2floor(node_mem[i]), ram_size); > + } > + } > + return ram_size; Can't this just fall-through as well to the below return? > + } > + return ram_size; > +} > + > #define _FDT(exp) \ > do { \ > int ret = (exp); \ > @@ -851,8 +865,8 @@ static void spapr_reset_htab(sPAPREnvironment *spapr) > > /* Update the RMA size if necessary */ > if (spapr->vrma_adjust) { > - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; > - spapr->rma_size = kvmppc_rma_size(node0_size, spapr->htab_shift); > + spapr->rma_size = kvmppc_rma_size(spapr_node0_size(), > + spapr->htab_shift); > } > } > > @@ -1284,7 +1298,7 @@ static void ppc_spapr_init(MachineState *machine) > MemoryRegion *sysmem = get_system_memory(); > MemoryRegion *ram = g_new(MemoryRegion, 1); > hwaddr rma_alloc_size; > - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; > + hwaddr node0_size = spapr_node0_size(); > uint32_t initrd_base = 0; > long kernel_size = 0, initrd_size = 0; > long load_limit, rtas_limit, fw_size; > -- > 2.0.0 >