Xen devel - Oct 2012 - [PATCH 01/10] xen: xenbus: quirk uses x86 specific cpuid

This breaks on ARM. This quirk is not necessary on ARM because no
hypervisors of that vintage exist for that architecture (port is too
new).

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 drivers/xen/xenbus/xenbus_xs.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index 48220e1..b46ad11 100644
--- 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
+
 static void xs_reset_watches(void)
 {
 	int err, supported = 0;
-- 
1.7.2.5

I botched the LKML address in my git send-email cmdline so these didn''t
go there. This is Xen specific enough that I don''t think it is worth
resending/spamming you guys with a repeat to fix that.

On Wed, 2012-10-17 at 09:39 +0100, Ian Campbell wrote:
> This breaks on ARM. This quirk is not necessary on ARM because no
> hypervisors of that vintage exist for that architecture (port is too
> new).
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> ---
>  drivers/xen/xenbus/xenbus_xs.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/xen/xenbus/xenbus_xs.c
b/drivers/xen/xenbus/xenbus_xs.c
> index 48220e1..b46ad11 100644
> --- 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
> +
>  static void xs_reset_watches(void)
>  {
>  	int err, supported = 0;

>>> 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?

Jan
> +
>  static void xs_reset_watches(void)
>  {
>  	int err, supported = 0;

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;
>