xenconsoled: honour XEN_LOG_DIR and remove hard-coded path

Make a _paths.h for xenconsoled as well and use that to generate a
default path for log file directory.

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 73478014ad406d9e2be3dd57a1e7929adeac43a4..b014509499e27797778e7fdd88933c9f19c56da3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,7 @@ tools/blktap2/vhd/vhd-util
 tools/console/xenconsole
 tools/console/xenconsoled
 tools/console/client/_paths.h
+tools/console/daemon/_paths.h
 tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/*
 tools/debugger/gdb/gdb-6.2.1/*
 tools/debugger/gdb/gdb-6.2.1.tar.bz2

diff --git a/tools/console/Makefile b/tools/console/Makefile
index a7bec7534dc11e05fb63bbe5c8368415764156ab..c8b030038bb811e11d78e82d4e32d1449ca8c89a 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -22,10 +22,12 @@ clean:
        $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS)
        $(RM) client/*.o daemon/*.o
        $(RM) client/_paths.h
+       $(RM) daemon/_paths.h
 
 .PHONY: distclean
 distclean: clean
 
+daemon/main.o: daemon/_paths.h
 daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab)
 xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
        $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS)
@@ -37,6 +39,9 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
 genpath-target = $(call buildmakevars2header,client/_paths.h)
 $(eval $(genpath-target))
 
+genpath-target = $(call buildmakevars2header,daemon/_paths.h)
+$(eval $(genpath-target))
+
 .PHONY: install
 install: $(BIN)
        $(INSTALL_DIR) $(DESTDIR)/$(sbindir)

diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c
index 23860d3e57e31cae1c1fa542079947db4e2b075f..20e35131e4cf1c39448b76fdfaaa3c03fead2308 100644 (file)
--- a/tools/console/daemon/main.c
+++ b/tools/console/daemon/main.c
@@ -31,6 +31,7 @@
 
 #include "utils.h"
 #include "io.h"
+#include "_paths.h"
 
 int log_reload = 0;
 int log_guest = 0;
@@ -176,7 +177,7 @@ int main(int argc, char **argv)
        }
 
        if (!log_dir) {
-               log_dir = strdup("/var/log/xen/console");
+               log_dir = strdup(XEN_LOG_DIR "/console");
        }
 
        if (geteuid() != 0) {