From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZOq7t-00048o-Ro for mharc-grub-devel@gnu.org; Mon, 10 Aug 2015 12:40:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOq7q-00047x-Qj for grub-devel@gnu.org; Mon, 10 Aug 2015 12:40:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZOq7h-0004qV-R3 for grub-devel@gnu.org; Mon, 10 Aug 2015 12:40:38 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:22354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOq7h-0004pr-Jv for grub-devel@gnu.org; Mon, 10 Aug 2015 12:40:29 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t7AGeOxE027271 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 10 Aug 2015 16:40:24 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t7AGeNVD024471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 10 Aug 2015 16:40:23 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by userv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t7AGeMwW016416; Mon, 10 Aug 2015 16:40:22 GMT Received: from l.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 10 Aug 2015 09:40:14 -0700 Received: by l.oracle.com (Postfix, from userid 1000) id B53486A3C8E; Mon, 10 Aug 2015 12:40:12 -0400 (EDT) Date: Mon, 10 Aug 2015 12:40:12 -0400 From: Konrad Rzeszutek Wilk To: Daniel Kiper Subject: Re: [Xen-devel] [PATCH v2 07/23] x86/boot/reloc: Rename some variables and rearrange code a bit Message-ID: <20150810164012.GC13576@l.oracle.com> References: <1437402558-7313-1-git-send-email-daniel.kiper@oracle.com> <1437402558-7313-8-git-send-email-daniel.kiper@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437402558-7313-8-git-send-email-daniel.kiper@oracle.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Source-IP: aserv0022.oracle.com [141.146.126.234] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 141.146.126.69 Cc: jgross@suse.com, grub-devel@gnu.org, keir@xen.org, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, andrew.cooper3@citrix.com, gang.wei@intel.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.com, xen-devel@lists.xenproject.org, wei.liu2@citrix.com, richard.l.maliszewski@intel.com, qiaowei.ren@intel.com, fu.wei@linaro.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2015 16:40:40 -0000 On Mon, Jul 20, 2015 at 04:29:02PM +0200, Daniel Kiper wrote: > Rename mbi and mbi_old variables and rearrange code a bit to make s/mbi_old/mbi_in/ Perhaps you want to say: rename mbi_old with mbi_in, and mbi with mbi_out or better: Replace mbi with mbi_out and mbi_old with mbi_in and ... > it more readable. Additionally, this way multiboot (v1) protocol > implementation and future multiboot2 protocol implementation will > use the same variable naming convention. > > Signed-off-by: Daniel Kiper Reviewed-by: Konrad Rzeszutek Wilk > --- > v2 - suggestions/fixes: > - extract this change from main mutliboot2 > protocol implementation > (suggested by Jan Beulich). > --- > xen/arch/x86/boot/reloc.c | 39 +++++++++++++++++++++------------------ > 1 file changed, 21 insertions(+), 18 deletions(-) > > diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c > index 09fd540..feb1d72 100644 > --- a/xen/arch/x86/boot/reloc.c > +++ b/xen/arch/x86/boot/reloc.c > @@ -86,41 +86,44 @@ static u32 copy_string(u32 src) > return copy_mem(src, p - src + 1); > } > > -multiboot_info_t *reloc(u32 mbi_old) > +multiboot_info_t *reloc(u32 mbi_in) > { > - multiboot_info_t *mbi = (multiboot_info_t *)copy_mem(mbi_old, sizeof(*mbi)); > int i; > + multiboot_info_t *mbi_out; > > - if ( mbi->flags & MBI_CMDLINE ) > - mbi->cmdline = copy_string(mbi->cmdline); > + mbi_out = (multiboot_info_t *)copy_mem(mbi_in, sizeof(*mbi_out)); > > - if ( mbi->flags & MBI_MODULES ) > + if ( mbi_out->flags & MBI_CMDLINE ) > + mbi_out->cmdline = copy_string(mbi_out->cmdline); > + > + if ( mbi_out->flags & MBI_MODULES ) > { > module_t *mods; > > - mbi->mods_addr = copy_mem(mbi->mods_addr, mbi->mods_count * sizeof(module_t)); > + mbi_out->mods_addr = copy_mem(mbi_out->mods_addr, > + mbi_out->mods_count * sizeof(module_t)); > > - mods = (module_t *)mbi->mods_addr; > + mods = (module_t *)mbi_out->mods_addr; > > - for ( i = 0; i < mbi->mods_count; i++ ) > + for ( i = 0; i < mbi_out->mods_count; i++ ) > { > if ( mods[i].string ) > mods[i].string = copy_string(mods[i].string); > } > } > > - if ( mbi->flags & MBI_MEMMAP ) > - mbi->mmap_addr = copy_mem(mbi->mmap_addr, mbi->mmap_length); > + if ( mbi_out->flags & MBI_MEMMAP ) > + mbi_out->mmap_addr = copy_mem(mbi_out->mmap_addr, mbi_out->mmap_length); > > - if ( mbi->flags & MBI_LOADERNAME ) > - mbi->boot_loader_name = copy_string(mbi->boot_loader_name); > + if ( mbi_out->flags & MBI_LOADERNAME ) > + mbi_out->boot_loader_name = copy_string(mbi_out->boot_loader_name); > > /* Mask features we don't understand or don't relocate. */ > - mbi->flags &= (MBI_MEMLIMITS | > - MBI_CMDLINE | > - MBI_MODULES | > - MBI_MEMMAP | > - MBI_LOADERNAME); > + mbi_out->flags &= (MBI_MEMLIMITS | > + MBI_CMDLINE | > + MBI_MODULES | > + MBI_MEMMAP | > + MBI_LOADERNAME); > > - return mbi; > + return mbi_out; > } > -- > 1.7.10.4 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel