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/python | |
| 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/python')
| -rw-r--r-- | tools/python/xen/lowlevel/checkpoint/checkpoint.c | 2 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/checkpoint/checkpoint.h | 2 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/checkpoint/libcheckpoint.c | 2 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/xs/xs.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/python/xen/lowlevel/checkpoint/checkpoint.c b/tools/python/xen/lowlevel/checkpoint/checkpoint.c index 9170778187..c5cdd83810 100644 --- a/tools/python/xen/lowlevel/checkpoint/checkpoint.c +++ b/tools/python/xen/lowlevel/checkpoint/checkpoint.c @@ -2,7 +2,7 @@ #include <Python.h> -#include <xs.h> +#include <xenstore.h> #include <xenctrl.h> #include "checkpoint.h" diff --git a/tools/python/xen/lowlevel/checkpoint/checkpoint.h b/tools/python/xen/lowlevel/checkpoint/checkpoint.h index 4b119bb38c..187d9d768c 100644 --- a/tools/python/xen/lowlevel/checkpoint/checkpoint.h +++ b/tools/python/xen/lowlevel/checkpoint/checkpoint.h @@ -8,7 +8,7 @@ #include <time.h> #include <xenguest.h> -#include <xs.h> +#include <xenstore.h> typedef enum { dt_unknown, diff --git a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c index 0fc433fcf9..01c0d47c12 100644 --- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c +++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c @@ -11,7 +11,7 @@ #include <xenctrl.h> #include <xenguest.h> -#include <xs.h> +#include <xenstore.h> #include "checkpoint.h" diff --git a/tools/python/xen/lowlevel/xs/xs.c b/tools/python/xen/lowlevel/xs/xs.c index 76a00a42a2..84e1711f60 100644 --- a/tools/python/xen/lowlevel/xs/xs.c +++ b/tools/python/xen/lowlevel/xs/xs.c @@ -30,7 +30,7 @@ #include <fcntl.h> #include <errno.h> -#include "xs.h" +#include <xenstore.h> /** @file * Python interface to the Xen Store Daemon (xs). |