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 | |
| 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
41 files changed, 59 insertions, 47 deletions
@@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= b7469189669c4de0a5161a869f443738d84539ec -# Fri May 11 12:40:42 2012 +0100 -# passthrough: Intel GPU passthrough, fix OpRegion mapping +QEMU_TAG ?= 7bde54662d45b0bbc2ee78c7a8bf2c97c6655445 +# Mon May 14 17:05:48 2012 +0100 +# xenstore: Use <xenstore.h> # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. @@ -241,6 +241,8 @@ uninstall: rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h + rm -rf $(D)$(INCLUDEDIR)/xenstore-compat/xs_lib.h $(D)$(INCLUDEDIR)/xensotre-compat/xs.h + rm -rf $(D)$(INCLUDEDIR)/xenstore_lib.h $(D)$(INCLUDEDIR)/xenstore.h rm -rf $(D)$(INCLUDEDIR)/xen rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl* rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c index 5875797f48..a7d35d689e 100644 --- a/extras/mini-os/lib/sys.c +++ b/extras/mini-os/lib/sys.c @@ -28,7 +28,7 @@ #include <blkfront.h> #include <fbfront.h> #include <xenbus.h> -#include <xs.h> +#include <xenstore.h> #include <sys/types.h> #include <sys/unistd.h> diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os/lib/xs.c index 6eced70347..a2a122098c 100644 --- a/extras/mini-os/lib/xs.c +++ b/extras/mini-os/lib/xs.c @@ -9,7 +9,7 @@ #ifdef HAVE_LIBC #include <os.h> #include <lib.h> -#include <xs.h> +#include <xenstore.h> #include <xenbus.h> #include <stdlib.h> #include <unistd.h> diff --git a/tools/Makefile b/tools/Makefile index a74df2f276..7b146785eb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -150,7 +150,8 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ -I$(XEN_ROOT)/tools/libxc \ - -I$(XEN_ROOT)/tools/xenstore" \ + -I$(XEN_ROOT)/tools/xenstore \ + -I$(XEN_ROOT)/tools/xenstore/compat" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore" \ --bindir=$(LIBEXEC) \ 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> diff --git a/tools/console/client/main.c b/tools/console/client/main.c index df3636fc20..523fc23ed5 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -39,7 +39,7 @@ #include <sys/stropts.h> #endif -#include "xs.h" +#include <xenstore.h> #include "xenctrl.h" #define ESCAPE_CHARACTER 0x1d diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index b6d41de99c..f09d63a304 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -22,7 +22,7 @@ #include "utils.h" #include "io.h" -#include <xs.h> +#include <xenstore.h> #include <xen/io/console.h> #include <stdlib.h> diff --git a/tools/console/daemon/utils.h b/tools/console/daemon/utils.h index 6743e5fdf6..8725dcdafa 100644 --- a/tools/console/daemon/utils.h +++ b/tools/console/daemon/utils.h @@ -26,7 +26,7 @@ #include <stdio.h> #include <xenctrl.h> -#include "xs.h" +#include <xenstore.h> void daemonize(const char *pidfile); bool xen_setup(void); diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index acaddd5b04..0c7cff6c57 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -40,7 +40,7 @@ #include <unistd.h> #include <fcntl.h> -#include <xs.h> +#include <xenstore.h> #include <xen/sys/evtchn.h> #include <xen/sys/gntalloc.h> #include <xen/sys/gntdev.h> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f71e76a55b..b2fe8bb101 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -44,7 +44,7 @@ #include <sys/wait.h> #include <sys/socket.h> -#include <xs.h> +#include <xenstore.h> #include <xenctrl.h> #include "xentoollog.h" diff --git a/tools/misc/xen-lowmemd.c b/tools/misc/xen-lowmemd.c index 42098e4d6f..82ffd752e0 100644 --- a/tools/misc/xen-lowmemd.c +++ b/tools/misc/xen-lowmemd.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <xenctrl.h> -#include <xs.h> +#include <xenstore.h> #include <stdlib.h> #include <string.h> 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). diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 4d72fe82ad..b69c65dd8a 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -38,7 +38,7 @@ #include <sys/time.h> #include <xen/arch-x86/xen-mca.h> #include <xg_save_restore.h> -#include <xs.h> +#include <xenstore.h> #define MCi_type_CTL 0x0 #define MCi_type_STATUS 0x1 diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c index 252759ea95..26e2ac1514 100644 --- a/tools/xcutils/xc_save.c +++ b/tools/xcutils/xc_save.c @@ -19,7 +19,7 @@ #include <fcntl.h> #include <err.h> -#include <xs.h> +#include <xenstore.h> #include <xenctrl.h> #include <xenguest.h> diff --git a/tools/xenbackendd/xenbackendd.c b/tools/xenbackendd/xenbackendd.c index a659baf6c0..6b5bb8e75d 100644 --- a/tools/xenbackendd/xenbackendd.c +++ b/tools/xenbackendd/xenbackendd.c @@ -28,7 +28,7 @@ #include <string.h> #include <syslog.h> -#include <xs.h> +#include <xenstore.h> #define DEVTYPE_UNKNOWN 0 #define DEVTYPE_VIF 1 diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 52dbdaa9f3..090e775d00 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -29,7 +29,7 @@ #include <unistd.h> #include <poll.h> #include <xc_private.h> -#include <xs.h> +#include <xenstore.h> #include <getopt.h> #include "xc_bitops.h" diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c index 28de744ef0..5dffff828d 100644 --- a/tools/xenpmd/xenpmd.c +++ b/tools/xenpmd/xenpmd.c @@ -40,7 +40,7 @@ #include <dirent.h> #include <unistd.h> #include <sys/stat.h> -#include <xs.h> +#include <xenstore.h> /* #define RUN_STANDALONE */ #define RUN_IN_SIMULATE_MODE diff --git a/tools/xenstat/libxenstat/src/xenstat_priv.h b/tools/xenstat/libxenstat/src/xenstat_priv.h index fdd70ed6e4..8490e232c6 100644 --- a/tools/xenstat/libxenstat/src/xenstat_priv.h +++ b/tools/xenstat/libxenstat/src/xenstat_priv.h @@ -24,7 +24,7 @@ #define XENSTAT_PRIV_H #include <sys/types.h> -#include <xs.h> +#include <xenstore.h> #include "xenstat.h" #include "xenctrl.h" diff --git a/tools/xenstore/COPYING b/tools/xenstore/COPYING index c20f517203..5a6237bb0b 100644 --- a/tools/xenstore/COPYING +++ b/tools/xenstore/COPYING @@ -1,6 +1,6 @@ This license (LGPL) applies to the xenstore library which interfaces -with the xenstore daemon (as stated in xs.c, xs.h, xs_lib.c and -xs_lib.h). The remaining files in the directory are licensed as +with the xenstore daemon (as stated in xs.c, xenstore.h, xs_lib.c and +xenstore_lib.h). The remaining files in the directory are licensed as stated in the comments (as of this writing, GPL, see ../../COPYING). diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index e95790165c..4ded89225b 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -109,6 +109,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) @@ -122,8 +123,12 @@ install: all ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) xenstore.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) xenstore_lib.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) compat/xs.h $(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs.h + $(INSTALL_DATA) compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs_lib.h + ln -sf xenstore-compat/xs.h $(DESTDIR)$(INCLUDEDIR)/xs.h + ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xs_lib.h -include $(DEPS) diff --git a/tools/xenstore/compat/xs.h b/tools/xenstore/compat/xs.h new file mode 100644 index 0000000000..99cf39bb1a --- /dev/null +++ b/tools/xenstore/compat/xs.h @@ -0,0 +1,2 @@ +#warning xs.h is deprecated use xenstore.h instead +#include <xenstore.h> diff --git a/tools/xenstore/compat/xs_lib.h b/tools/xenstore/compat/xs_lib.h new file mode 100644 index 0000000000..ad81b54c0e --- /dev/null +++ b/tools/xenstore/compat/xs_lib.h @@ -0,0 +1,2 @@ +#warning xs_lib.h is deprecated use xenstore_lib.h instead +#include <xenstore_lib.h> diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/xenstore/init-xenstore-domain.c index f3a4497bcc..18c075bebd 100644 --- a/tools/xenstore/init-xenstore-domain.c +++ b/tools/xenstore/init-xenstore-domain.c @@ -7,7 +7,7 @@ #include <sys/mman.h> #include <xenctrl.h> #include <xc_dom.h> -#include <xs.h> +#include <xenstore.h> #include <xen/sys/xenbus_dev.h> static uint32_t domid = -1; diff --git a/tools/xenstore/xs.h b/tools/xenstore/xenstore.h index 8d49e50e46..7259e49cd6 100644 --- a/tools/xenstore/xs.h +++ b/tools/xenstore/xenstore.h @@ -17,10 +17,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _XS_H -#define _XS_H +#ifndef XENSTORE_H +#define XENSTORE_H -#include <xs_lib.h> +#include <xenstore_lib.h> #define XBT_NULL 0 @@ -223,7 +223,7 @@ char *xs_debug_command(struct xs_handle *h, const char *cmd, void *data, unsigned int len); int xs_suspend_evtchn_port(int domid); -#endif /* _XS_H */ +#endif /* XENSTORE_H */ /* * Local variables: diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index 94b82b99af..37b1bc65e1 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -18,7 +18,7 @@ #include <string.h> #include <termios.h> #include <unistd.h> -#include <xs.h> +#include <xenstore.h> #include <sys/ioctl.h> diff --git a/tools/xenstore/xenstore_control.c b/tools/xenstore/xenstore_control.c index 0be80261e4..0a108df0aa 100644 --- a/tools/xenstore/xenstore_control.c +++ b/tools/xenstore/xenstore_control.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> -#include "xs.h" +#include "xenstore.h" int main(int argc, char **argv) diff --git a/tools/xenstore/xs_lib.h b/tools/xenstore/xenstore_lib.h index bea010d78f..5c2baf6b40 100644 --- a/tools/xenstore/xs_lib.h +++ b/tools/xenstore/xenstore_lib.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _XS_LIB_H -#define _XS_LIB_H +#ifndef XENSTORE_LIB_H +#define XENSTORE_LIB_H #include <stdbool.h> #include <limits.h> @@ -82,4 +82,4 @@ char *sanitise_value(struct expanding_buffer *, const char *val, unsigned len); /* *out_len_r on entry is ignored; out must be at least strlen(in)+1 bytes. */ void unsanitise_value(char *out, unsigned *out_len_r, const char *in); -#endif /* _XS_LIB_H */ +#endif /* XENSTORE_LIB_H */ diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index a42f55291d..bd44645370 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -44,7 +44,7 @@ #include "utils.h" #include "list.h" #include "talloc.h" -#include "xs_lib.h" +#include "xenstore_lib.h" #include "xenstored_core.h" #include "xenstored_watch.h" #include "xenstored_transaction.h" diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 92c27ba92f..492ca0d9a7 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -27,7 +27,7 @@ #include <stdbool.h> #include <stdint.h> #include <errno.h> -#include "xs_lib.h" +#include "xenstore_lib.h" #include "list.h" #include "tdb.h" diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 380c691bb2..50a32fbcba 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -33,7 +33,7 @@ #include "xenstored_transaction.h" #include "xenstored_watch.h" #include "xenstored_domain.h" -#include "xs_lib.h" +#include "xenstore_lib.h" #include "utils.h" struct changed_node diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 65d4025239..2ac498ae7f 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -27,7 +27,7 @@ #include "talloc.h" #include "list.h" #include "xenstored_watch.h" -#include "xs_lib.h" +#include "xenstore_lib.h" #include "utils.h" #include "xenstored_domain.h" diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index 0a01675a78..f141066efc 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -32,7 +32,7 @@ #include <signal.h> #include <stdint.h> #include <errno.h> -#include "xs.h" +#include "xenstore.h" #include "list.h" #include "utils.h" diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c index 03a9ee4393..f7076cc62c 100644 --- a/tools/xenstore/xs_lib.c +++ b/tools/xenstore/xs_lib.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <errno.h> #include <assert.h> -#include "xs_lib.h" +#include "xenstore_lib.h" /* Common routines for the Xen store daemon and client library. */ diff --git a/tools/xenstore/xs_tdb_dump.c b/tools/xenstore/xs_tdb_dump.c index d3c515418c..7aa7158595 100644 --- a/tools/xenstore/xs_tdb_dump.c +++ b/tools/xenstore/xs_tdb_dump.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> -#include "xs_lib.h" +#include "xenstore_lib.h" #include "tdb.h" #include "talloc.h" #include "utils.h" |