Commit 6e3cd6c6 authored by Ian Campbell's avatar Ian Campbell

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: default avatarBastian Blank <waldi@debian.org>
Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Acked-by: default avatarIan Jackson <ian.jackson@eu.citrix.com>
Committed-by: default avatarIan Jackson <ian.jackson@eu.citrix.com>
parent 8df9416b
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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) \
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -39,7 +39,7 @@
#include <sys/stropts.h>
#endif
#include "xs.h"
#include <xenstore.h>
#include "xenctrl.h"
#define ESCAPE_CHARACTER 0x1d
......
......@@ -22,7 +22,7 @@
#include "utils.h"
#include "io.h"
#include <xs.h>
#include <xenstore.h>
#include <xen/io/console.h>
#include <stdlib.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);
......
......@@ -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>
......
......@@ -44,7 +44,7 @@
#include <sys/wait.h>
#include <sys/socket.h>
#include <xs.h>
#include <xenstore.h>
#include <xenctrl.h>
#include "xentoollog.h"
......
......@@ -5,7 +5,7 @@
#include <stdio.h>
#include <xenctrl.h>
#include <xs.h>
#include <xenstore.h>
#include <stdlib.h>
#include <string.h>
......
......@@ -2,7 +2,7 @@
#include <Python.h>
#include <xs.h>
#include <xenstore.h>
#include <xenctrl.h>
#include "checkpoint.h"
......
......@@ -8,7 +8,7 @@
#include <time.h>
#include <xenguest.h>
#include <xs.h>
#include <xenstore.h>
typedef enum {
dt_unknown,
......
......@@ -11,7 +11,7 @@
#include <xenctrl.h>
#include <xenguest.h>
#include <xs.h>
#include <xenstore.h>
#include "checkpoint.h"
......
......@@ -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).
......
......@@ -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
......
......@@ -19,7 +19,7 @@
#include <fcntl.h>
#include <err.h>
#include <xs.h>
#include <xenstore.h>
#include <xenctrl.h>
#include <xenguest.h>
......
......@@ -28,7 +28,7 @@
#include <string.h>
#include <syslog.h>
#include <xs.h>
#include <xenstore.h>
#define DEVTYPE_UNKNOWN 0
#define DEVTYPE_VIF 1
......
......@@ -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"
......
......@@ -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
......
......@@ -24,7 +24,7 @@
#define XENSTAT_PRIV_H
#include <sys/types.h>
#include <xs.h>
#include <xenstore.h>
#include "xenstat.h"
#include "xenctrl.h"
......
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).
......
......@@ -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)
......
#warning xs.h is deprecated use xenstore.h instead
#include <xenstore.h>
#warning xs_lib.h is deprecated use xenstore_lib.h instead
#include <xenstore_lib.h>
......@@ -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;
......
......@@ -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:
......
......@@ -18,7 +18,7 @@
#include <string.h>
#include <termios.h>
#include <unistd.h>
#include <xs.h>
#include <xenstore.h>
#include <sys/ioctl.h>
......
......@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include "xs.h"
#include "xenstore.h"
int main(int argc, char **argv)
......
......@@ -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 */
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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. */
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment