diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2012-05-14 17:15:36 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2012-05-14 17:15:36 +0100 |
| commit | debddaa56c84f5809774f34fdd190bc5f4a6cf16 (patch) | |
| tree | da59df5612d82de5a163d67c7f9e4b3d86d84fe3 /tools/blktap | |
| parent | 633979eeb74ecf9200a2f86eff9ed3f09c12bea9 (diff) | |
| download | xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.gz xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.bz2 xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.zip | |
nstore: rename public xenstore headers
The xenstore header xs.h is producing conflicts with other software[1].
xs is a too short identifier and does not matche the library. Renaming
the headers to xenstore.h and xenstore_lib.h is the easiest way to make
them easy recognizable and prevent furthe problems.
[1]: http://bugs.debian.org/668550
[ Also update QEMU_TAG, to bring in corresponding change to
qemu-xen-traditional. -iwj ]
Signed-off-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
--HG--
rename : tools/xenstore/xs.h => tools/xenstore/xenstore.h
rename : tools/xenstore/xs_lib.h => tools/xenstore/xenstore_lib.h
Diffstat (limited to 'tools/blktap')
| -rw-r--r-- | tools/blktap/drivers/blktapctrl.c | 2 | ||||
| -rw-r--r-- | tools/blktap/lib/blktaplib.h | 2 | ||||
| -rw-r--r-- | tools/blktap/lib/xenbus.c | 2 | ||||
| -rw-r--r-- | tools/blktap/lib/xs_api.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c index 445d2a0863..0a8b8800e8 100644 --- a/tools/blktap/drivers/blktapctrl.c +++ b/tools/blktap/drivers/blktapctrl.c @@ -47,7 +47,7 @@ #include <sys/ioctl.h> #include <string.h> #include <unistd.h> -#include <xs.h> +#include <xenstore.h> #include <sys/time.h> #include <syslog.h> #ifdef MEMSHR diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h index 47dcdff05b..a80e518361 100644 --- a/tools/blktap/lib/blktaplib.h +++ b/tools/blktap/lib/blktaplib.h @@ -38,7 +38,7 @@ #include <xen/xen.h> #include <xen/io/blkif.h> #include <xen/io/ring.h> -#include <xs.h> +#include <xenstore.h> #include <sys/types.h> #include <unistd.h> diff --git a/tools/blktap/lib/xenbus.c b/tools/blktap/lib/xenbus.c index 53db3c8b29..948eb02664 100644 --- a/tools/blktap/lib/xenbus.c +++ b/tools/blktap/lib/xenbus.c @@ -41,7 +41,7 @@ #include <err.h> #include <stdarg.h> #include <errno.h> -#include <xs.h> +#include <xenstore.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/tools/blktap/lib/xs_api.c b/tools/blktap/lib/xs_api.c index 93d1cb9160..464843239e 100644 --- a/tools/blktap/lib/xs_api.c +++ b/tools/blktap/lib/xs_api.c @@ -38,7 +38,7 @@ #include <err.h> #include <stdarg.h> #include <errno.h> -#include <xs.h> +#include <xenstore.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> |