Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933431AbbHJKI2 (ORCPT ); Mon, 10 Aug 2015 06:08:28 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:63760 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933109AbbHJKIY (ORCPT ); Mon, 10 Aug 2015 06:08:24 -0400 X-IronPort-AV: E=Sophos;i="5.15,644,1432598400"; d="scan'208";a="292916872" Date: Mon, 10 Aug 2015 11:06:55 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Julien Grall CC: , , , , "Konrad Rzeszutek Wilk" , Boris Ostrovsky , David Vrabel Subject: Re: [PATCH v3 9/9] xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn In-Reply-To: <1438965282-19103-10-git-send-email-julien.grall@citrix.com> Message-ID: References: <1438965282-19103-1-git-send-email-julien.grall@citrix.com> <1438965282-19103-10-git-send-email-julien.grall@citrix.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2876 Lines: 80 On Fri, 7 Aug 2015, Julien Grall wrote: > The variable xen_store_mfn is effectively storing a GFN and not an MFN. > > Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini > Cc: Konrad Rzeszutek Wilk > Cc: Boris Ostrovsky > Cc: David Vrabel > > I think that the assignation of xen_start_info in > xenstored_local_init is pointless. Although I haven't drop it just > in case. > > Changes in v3: > - Patch added. > --- > drivers/xen/xenbus/xenbus_probe.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c > index b3870f4..3cbe055 100644 > --- a/drivers/xen/xenbus/xenbus_probe.c > +++ b/drivers/xen/xenbus/xenbus_probe.c > @@ -75,7 +75,7 @@ EXPORT_SYMBOL_GPL(xen_store_interface); > enum xenstore_init xen_store_domain_type; > EXPORT_SYMBOL_GPL(xen_store_domain_type); > > -static unsigned long xen_store_mfn; > +static unsigned long xen_store_gfn; > > static BLOCKING_NOTIFIER_HEAD(xenstore_chain); > > @@ -711,7 +711,7 @@ static int __init xenstored_local_init(void) > if (!page) > goto out_err; > > - xen_store_mfn = xen_start_info->store_mfn = virt_to_gfn((void *)page); > + xen_store_gfn = xen_start_info->store_mfn = virt_to_gfn((void *)page); > > /* Next allocate a local port which xenstored can bind to */ > alloc_unbound.dom = DOMID_SELF; > @@ -785,12 +785,12 @@ static int __init xenbus_init(void) > err = xenstored_local_init(); > if (err) > goto out_error; > - xen_store_interface = gfn_to_virt(xen_store_mfn); > + xen_store_interface = gfn_to_virt(xen_store_gfn); > break; > case XS_PV: > xen_store_evtchn = xen_start_info->store_evtchn; > - xen_store_mfn = xen_start_info->store_mfn; > - xen_store_interface = gfn_to_virt(xen_store_mfn); > + xen_store_gfn = xen_start_info->store_mfn; > + xen_store_interface = gfn_to_virt(xen_store_gfn); > break; > case XS_HVM: > err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); > @@ -800,9 +800,9 @@ static int __init xenbus_init(void) > err = hvm_get_parameter(HVM_PARAM_STORE_PFN, &v); > if (err) > goto out_error; > - xen_store_mfn = (unsigned long)v; > + xen_store_gfn = (unsigned long)v; > xen_store_interface = > - xen_remap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE); > + xen_remap(xen_store_gfn << PAGE_SHIFT, PAGE_SIZE); > break; > default: > pr_warn("Xenstore state unknown\n"); > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/