From: Wei Liu <wei.liu2@citrix.com>
Date: Thu, 9 Jun 2016 12:57:36 +0000 (+0100)
Subject: xenbackendd: honour XEN_{RUN,LOG}_DIR
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~977
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6c5f6f8a62777e112c697e42a4f4282800dcf84b;p=xen.git

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 b014509499..af0e0a8f5b 100644
--- 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 f52be74f13..80ac7f4e61 100644
--- 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 e21464bfce..b6d92984e0 100644
--- 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