[Xen-changelog] [xen-unstable] xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path()

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1321804963 -3600
# Node ID cd5948592b107c068c6d7bae2cbe6a5765431a94
# Parent  2087f21befc202b2ae1c0f8318d51ddd500e1173
xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path()

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---


diff -r 2087f21befc2 -r cd5948592b10 Config.mk
--- a/Config.mk Sun Nov 20 17:02:42 2011 +0100
+++ b/Config.mk Sun Nov 20 17:02:43 2011 +0100
@@ -142,7 +142,7 @@
        $(foreach var,                                                      \
                  SBINDIR BINDIR LIBEXEC LIBDIR SHAREDIR PRIVATE_BINDIR     \
                  XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \
-                 XEN_RUN_DIR,                                              \
+                 XEN_RUN_DIR XEN_PAGING_DIR,                               \
                  echo "$(var)=\"$($(var))\"" >>$(1).tmp;)        \
        $(call move-if-changed,$(1).tmp,$(1))
 endef
diff -r 2087f21befc2 -r cd5948592b10 config/StdGNU.mk
--- a/config/StdGNU.mk  Sun Nov 20 17:02:42 2011 +0100
+++ b/config/StdGNU.mk  Sun Nov 20 17:02:43 2011 +0100
@@ -53,10 +53,12 @@
 CONFIG_DIR = /etc
 XEN_LOCK_DIR = /var/lock
 XEN_RUN_DIR = /var/run/xen
+XEN_PAGING_DIR = /var/lib/xen/xenpaging
 else
 CONFIG_DIR = $(PREFIX)/etc
 XEN_LOCK_DIR = $(PREFIX)/var/lock
 XEN_RUN_DIR = $(PREFIX)/var/run/xen
+XEN_PAGING_DIR = $(PREFIX)/var/lib/xen/xenpaging
 endif
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
diff -r 2087f21befc2 -r cd5948592b10 tools/libxl/libxl.h
--- a/tools/libxl/libxl.h       Sun Nov 20 17:02:42 2011 +0100
+++ b/tools/libxl/libxl.h       Sun Nov 20 17:02:43 2011 +0100
@@ -633,6 +633,7 @@
 const char *libxl_xen_script_dir_path(void);
 const char *libxl_lock_dir_path(void);
 const char *libxl_run_dir_path(void);
+const char *libxl_xenpaging_dir_path(void);
 
 #endif /* LIBXL_H */
 
diff -r 2087f21befc2 -r cd5948592b10 tools/libxl/libxl_paths.c
--- a/tools/libxl/libxl_paths.c Sun Nov 20 17:02:42 2011 +0100
+++ b/tools/libxl/libxl_paths.c Sun Nov 20 17:02:43 2011 +0100
@@ -70,6 +70,11 @@
     return XEN_RUN_DIR;
 }
 
+const char *libxl_xenpaging_dir_path(void)
+{
+    return XEN_PAGING_DIR;
+}
+
 /*
  * Local variables:
  * mode: C
diff -r 2087f21befc2 -r cd5948592b10 tools/xenpaging/Makefile
--- a/tools/xenpaging/Makefile  Sun Nov 20 17:02:42 2011 +0100
+++ b/tools/xenpaging/Makefile  Sun Nov 20 17:02:43 2011 +0100
@@ -23,7 +23,7 @@
        $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS)
 
 install: all
-       $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/xenpaging
+       $(INSTALL_DIR) $(DESTDIR)$(XEN_PAGING_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
        $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog