Fix compilation of legacy xen driver with Xen 4.2

In Xen 4.2, xs.h is deprecated in favor of xenstore.h.  xs.h now
contains

#warning xs.h is deprecated use xenstore.h instead
#include <xenstore.h>

which fails compilation when warnings are treated as errors.

Introduce a configure-time check for xenstore.h and if found,
use it instead of xs.h.
(cherry picked from commit 416eca189b1934cfa8575ab72d142ec77600fcf9)

diff --git a/configure.ac b/configure.ac
index 1e1cb17c1d328607fb4594607bbcbc806049024a..e3cf4e2d1abac4c73f1c50ac7ae6ca715da556c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -691,6 +691,8 @@ if test "$with_xen" != "no" ; then
 fi
 
 if test "$with_xen" != "no" ; then
+    dnl In Xen 4.2, xs.h is deprecated in favor of xenstore.h.
+    AC_CHECK_HEADERS([xenstore.h])
     AC_CHECK_HEADERS([xen/xen.h xen/version.h xen/dom0_ops.h],,[
        if test "$with_xen" = "yes"; then
            fail=1

diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 50ace86eb839a88b1edaa8f91df92c6d87a31532..6eb304160ab93aa73fc35858652db82dff8abfbc 100644 (file)
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -20,7 +20,11 @@
 # include <unistd.h>
 # include <regex.h>
 
-# include <xs.h>
+# if HAVE_XENSTORE_H
+#  include <xenstore.h>
+# else
+#  include <xs.h>
+# endif
 
 # include "virterror_internal.h"
 # include "datatypes.h"

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index d1bcb27c60bc27d9c5a01ff37a7471d5ee269f49..54f604ebd684d216684658cd2104abbde4e33b08 100644 (file)
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -23,7 +23,11 @@
 #include <xen/dom0_ops.h>
 #include <xen/version.h>
 
-#include <xs.h>
+#if HAVE_XENSTORE_H
+# include <xenstore.h>
+#else
+# include <xs.h>
+#endif
 
 #include "virterror_internal.h"
 #include "datatypes.h"