[Xen-changelog] [qemu-upstream-unstable] xenstore: Use <xenstore.h>

[patchbot@xxxxxxx]

commit c64d5b2a859d81aeccbf036655e9ba67bae095d6
Author: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Date:   Wed Jun 27 10:10:08 2012 +0000

    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@xxxxxxxxxx>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 configure       |    2 +-
 hw/xen_common.h |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 9e0ea78..2f6520c 100755
--- 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 bb5a12f..30f9140 100644
--- 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"
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog