xenstore: Use <xenstore.h>

<xs.h> is going away.

This change needs to be made in lockstep with xen-unstable.hg, which
will be done by a change to the QEMU_TAG in the xen-unstable.hg
changeset.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 64dc93ad1d030cbb4df75f3fc4bf0d27464a622e..92b350665db837ac97eaa3388963ff85ad8a1bd0 100644 (file)
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -32,7 +32,7 @@
 #include <sys/mman.h>
 #include <sys/signal.h>
 
-#include <xs.h>
+#include <xenstore.h>
 #include <xenctrl.h>
 #include <xen/grant_table.h>
 

diff --git a/hw/xen_common.h b/hw/xen_common.h
index 7562567b5af24e22dda3715ece1fba2b607e9c20..a6150521ddc5e0c13145abc625fff4df2d9247eb 100644 (file)
--- a/hw/xen_common.h
+++ b/hw/xen_common.h
@@ -5,7 +5,7 @@
 #include <inttypes.h>
 
 #include <xenctrl.h>
-#include <xs.h>
+#include <xenstore.h>
 #include <xen/io/xenbus.h>
 
 #include "hw.h"

diff --git a/hw/xen_console.c b/hw/xen_console.c
index 8d1413156bb157576c33638c95896a927f393d94..80beb31b7329a17539127e12b4f313a24b8cb2ad 100644 (file)
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -29,7 +29,7 @@
 #include <termios.h>
 #include <stdarg.h>
 #include <sys/mman.h>
-#include <xs.h>
+#include <xenstore.h>
 #include <xen/io/console.h>
 #include <xenctrl.h>
 

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 5db58accc57fcd077726603179b4cc8535f089ca..04a62e2ea3122aab6868155d2bffe432d07c83e1 100644 (file)
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -33,7 +33,7 @@
 #include <sys/mman.h>
 #include <sys/uio.h>
 
-#include <xs.h>
+#include <xenstore.h>
 #include <xenctrl.h>
 #include <xen/io/xenbus.h>
 

diff --git a/hw/xenfb.c b/hw/xenfb.c
index 96c2a6f9bfe13b5cedcc22ee67987fe2c7df240e..75b2bc242112b6be60d656b6c06984aea4ced36d 100644 (file)
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <xs.h>
+#include <xenstore.h>
 #include <xenctrl.h>
 #include <xen/event_channel.h>
 #include <xen/io/xenbus.h>

diff --git a/xen-config-host.h b/xen-config-host.h
index 818f25d89b274b0ecae617301029e65a381f8fb6..647f6be18ce5a0f2a78f0e79013432958a669fd8 100644 (file)
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -17,7 +17,7 @@ extern int domid, domid_backend;
 #include <stdbool.h>
 
 #include "xenctrl.h"
-#include "xs.h"
+#include "xenstore.h"
 #if !defined(CONFIG_STUBDOM) && !defined(__NetBSD__)
 #include "blktaplib.h"
 #endif