xenbackendd: honour XEN_{RUN,LOG}_DIR

Also added a gitignore entry for xenbackendd binary while I was there.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/.gitignore b/.gitignore
index b014509499e27797778e7fdd88933c9f19c56da3..af0e0a8f5b7d5c7a8809060114ddcebcd8b7de83 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -210,6 +210,8 @@ tools/tests/mem-sharing/memshrtool
 tools/tests/mce-test/tools/xen-mceinj
 tools/xcutils/lsevtchn
 tools/xcutils/readnotes
+tools/xenbackendd/_paths.h
+tools/xenbackendd/xenbackendd
 tools/xenmon/xentrace_setmask
 tools/xenmon/xenbaked
 tools/xenpaging/xenpaging

diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile
index f52be74f1323be5dded305e20f07f429d33c3162..80ac7f4e61e2a0d1d8f7d0317cd0e580d1524c4e 100644 (file)
--- a/tools/xenbackendd/Makefile
+++ b/tools/xenbackendd/Makefile
@@ -30,12 +30,16 @@ install: build
 
 .PHONY: clean
 clean:
-       $(RM) *.a *.so *.o $(DEPS) xenbackendd
+       $(RM) *.a *.so *.o $(DEPS) xenbackendd _paths.h
 
 .PHONY: distclean
 distclean: clean
 
+xenbackendd.o: _paths.h
 xenbackendd: xenbackendd.o
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 
+genpath-target = $(call buildmakevars2header,_paths.h)
+$(eval $(genpath-target))
+
 -include $(DEPS)

diff --git a/tools/xenbackendd/xenbackendd.c b/tools/xenbackendd/xenbackendd.c
index e21464bfce2f3efa77b591b4aac3d7e881594ab3..b6d92984e0acf1bf827244f469fb3c4857308e60 100644 (file)
--- a/tools/xenbackendd/xenbackendd.c
+++ b/tools/xenbackendd/xenbackendd.c
@@ -29,6 +29,8 @@
 
 #include <xenstore.h>
 
+#include "_paths.h"
+
 #define DEVTYPE_UNKNOWN 0
 #define DEVTYPE_VIF 1
 #define DEVTYPE_VBD 2
@@ -44,10 +46,10 @@
 #define VBD_SCRIPT XEN_SCRIPT_DIR"/block"
 #endif
 #ifndef LOG_FILE
-#define LOG_FILE "/var/log/xen/xenbackendd.log"
+#define LOG_FILE XEN_LOG_DIR "xenbackendd.log"
 #endif
 #ifndef PID_FILE
-#define PID_FILE "/var/run/xenbackendd.pid"
+#define PID_FILE XEN_RUN_DIR "xenbackendd.pid"
 #endif