xenstore: Use <xenstore.h>

In the next release of Xen (4.2), xs.h became deprecated.

upstream-commit: e108a3c110506faf3ef43448be3e0d39ef0ead8f

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/configure b/configure
index 9e0ea7869d222a52f17c3d92d370d92db7feced3..2f6520cbffb583c095ae65b9a88c44daa71969ac 100755 (executable)
--- a/configure
+++ b/configure
@@ -1314,7 +1314,7 @@ if test "$xen" != "no" ; then
   # Xen unstable
   cat > $TMPC <<EOF
 #include <xenctrl.h>
-#include <xs.h>
+#include <xenstore.h>
 #include <stdint.h>
 #include <xen/hvm/hvm_info_table.h>
 #if !defined(HVM_MAX_VCPUS)

diff --git a/hw/xen_common.h b/hw/xen_common.h
index bb5a12fc89c1477bb972adf64fc54135d3b6d01e..30f91408823842e63d57c63d09828fa7ddb48439 100644 (file)
--- a/hw/xen_common.h
+++ b/hw/xen_common.h
@@ -7,7 +7,11 @@
 #include <inttypes.h>
 
 #include <xenctrl.h>
-#include <xs.h>
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
+#  include <xs.h>
+#else
+#  include <xenstore.h>
+#endif
 #include <xen/io/xenbus.h>
 
 #include "hw.h"