From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: [PATCH 01/10] xen: xenbus: quirk uses x86 specific
 cpuid
Date: Wed, 17 Oct 2012 10:56:02 -0400
Message-ID: <20121017145602.GB7594@phenom.dumpdata.com>
References: <1350463138.2460.19.camel@zakaz.uk.xensource.com>
	<1350463157-5068-1-git-send-email-ian.campbell@citrix.com>
	<507E91E602000078000A1E76@nat28.tlf.novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <507E91E602000078000A1E76@nat28.tlf.novell.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Jan Beulich <JBeulich@suse.com>
Cc: Stefano Stabellini <stefano.stabellini@citrix.com>, Ian Campbell <ian.campbell@citrix.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

On Wed, Oct 17, 2012 at 10:09:26AM +0100, Jan Beulich wrote:
> >>> On 17.10.12 at 10:39, Ian Campbell <ian.campbell@citrix.com> wrote:
> > --- a/drivers/xen/xenbus/xenbus_xs.c
> > +++ b/drivers/xen/xenbus/xenbus_xs.c
> > @@ -619,6 +619,8 @@ static struct xenbus_watch *find_watch(const char *token)
> >  
> >  	return NULL;
> >  }
> > +
> > +#ifdef CONFIG_X86
> >  /*
> >   * Certain older XenBus toolstack cannot handle reading values that are
> >   * not populated. Some Xen 3.4 installation are incapable of doing this
> > @@ -637,6 +639,10 @@ static bool xen_strict_xenbus_quirk()
> >  	return false;
> >  
> >  }
> > +#else
> > +static bool xen_strict_xenbus_quirk(void) { return false; }
> > +#endif
> 
> Wouldn't it reduce redundancy if the #ifdef block was inserted
> inside the existing function?

Applied with Jan's suggestions.
> 
> Jan
> 
> > +
> >  static void xs_reset_watches(void)
> >  {
> >  	int err, supported = 0;
>