From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqDBR-0000Bg-T9 for qemu-devel@nongnu.org; Thu, 07 May 2015 00:13:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqDBN-00050N-1F for qemu-devel@nongnu.org; Thu, 07 May 2015 00:13:13 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:36270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqDBM-00050B-SJ for qemu-devel@nongnu.org; Thu, 07 May 2015 00:13:08 -0400 Received: by pabsx10 with SMTP id sx10so28521890pab.3 for ; Wed, 06 May 2015 21:13:07 -0700 (PDT) Message-ID: <554AE64A.5050901@ozlabs.ru> Date: Thu, 07 May 2015 14:12:58 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1430971024-27899-1-git-send-email-david@gibson.dropbear.id.au> <1430971024-27899-3-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1430971024-27899-3-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] [PATCH 2/4] spapr: Remove obsolete ram_limit field from sPAPRMachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Cc: lvivier@redhat.com, thuth@redhat.com, mdroth@linux.vnet.ibm.com, agraf@suse.de, bharata@linux.vnet.ibm.com, afaerber@suse.de On 05/07/2015 01:57 PM, David Gibson wrote: > The ram_limit field was imported from sPAPREnvironment where it predates > the machine's ram size being available generically from machine->ram_size. > > Signed-off-by: David Gibson > --- > hw/ppc/spapr.c | 3 +-- > hw/ppc/spapr_hcall.c | 3 ++- > include/hw/ppc/spapr.h | 1 - > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 601c41b..1123358 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1496,9 +1496,8 @@ static void ppc_spapr_init(MachineState *machine) > } > > /* allocate RAM */ > - sm->ram_limit = ram_size; I had to look at the code to realize that ram_size is local and it can actually be removed. > memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram", > - sm->ram_limit); > + machine->ram_size); > memory_region_add_subregion(sysmem, 0, ram); > > if (rma_alloc_size && rma) { > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index bf4b05a..e52983a 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -87,6 +87,7 @@ static inline bool valid_pte_index(CPUPPCState *env, target_ulong pte_index) > static target_ulong h_enter(PowerPCCPU *cpu, sPAPRMachineState *sm, > target_ulong opcode, target_ulong *args) > { > + MachineState *machine = MACHINE(sm); > CPUPPCState *env = &cpu->env; > target_ulong flags = args[0]; > target_ulong pte_index = args[1]; > @@ -118,7 +119,7 @@ static target_ulong h_enter(PowerPCCPU *cpu, sPAPRMachineState *sm, > > raddr = (ptel & HPTE64_R_RPN) & ~((1ULL << page_shift) - 1); > > - if (raddr < sm->ram_limit) { > + if (raddr < machine->ram_size) { > /* Regular RAM - should have WIMG=0010 */ > if ((ptel & HPTE64_R_WIMG) != HPTE64_R_M) { > return H_PARAMETER; > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index c3652aa..9e7cf0f 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -33,7 +33,6 @@ struct sPAPRMachineState { > XICSState *icp; > DeviceState *rtc; > > - hwaddr ram_limit; > void *htab; > uint32_t htab_shift; > hwaddr rma_size; > -- Alexey