xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path()

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

diff --git a/Config.mk b/Config.mk
index 728a765c3b361445ab16d12369b64e76dbd173c2..a9c0fd018542411a20752cc7896873ca009ecf16 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -142,7 +142,7 @@ define buildmakevars2file-closure
        $(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 --git a/config/StdGNU.mk b/config/StdGNU.mk
index 68fa22688434502a4353f5a777dfcbba670c27b5..2af2841ccc558252bb7be58dd65b35bb160bfdb6 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -53,10 +53,12 @@ ifeq ($(PREFIX),/usr)
 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 --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 6ce3d8382836fa5d899ad8c9f87e1dd129ae8db4..289dc85b7b998410b0a167098f40130c4fab864a 100644 (file)
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -633,6 +633,7 @@ const char *libxl_xen_config_dir_path(void);
 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 --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c
index 64f662d8a78888e4055001c98127b68340070e66..c84e51da0d71da4d04adb859f0cbecf684156989 100644 (file)
--- a/tools/libxl/libxl_paths.c
+++ b/tools/libxl/libxl_paths.c
@@ -70,6 +70,11 @@ const char *libxl_run_dir_path(void)
     return XEN_RUN_DIR;
 }
 
+const char *libxl_xenpaging_dir_path(void)
+{
+    return XEN_PAGING_DIR;
+}
+
 /*
  * Local variables:
  * mode: C

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index e80ae5d6a38e4ace818b6138d60f9acf0d6f9f86..08230a6af5ba253f4c32de988a10ab96eec4efca 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -23,7 +23,7 @@ xenpaging: $(OBJS)
        $(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)