From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>, Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH 04/11] xenconsoled: honour XEN_LOG_DIR and remove hard-coded path
Date: Thu, 9 Jun 2016 13:57:35 +0100 [thread overview]
Message-ID: <1465477062-28805-5-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1465477062-28805-1-git-send-email-wei.liu2@citrix.com>
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>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
.gitignore | 1 +
tools/console/Makefile | 5 +++++
tools/console/daemon/main.c | 3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 7347801..b014509 100644
--- 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 a7bec75..c8b0300 100644
--- 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 23860d3..20e3513 100644
--- 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) {
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-09 12:57 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-09 12:57 [PATCH 00/11] Honour XEN_{LOG, RUN}_DIR in various places Wei Liu
2016-06-09 12:57 ` [PATCH 01/11] Config.mk: add XEN_LOG_DIR to BUILD_MAKE_VARS Wei Liu
2016-06-09 15:46 ` Ian Jackson
2016-06-09 12:57 ` [PATCH 02/11] docs: use XEN_LOG_DIR in log file location Wei Liu
2016-06-09 15:47 ` Ian Jackson
2016-06-09 15:51 ` Wei Liu
2016-06-09 12:57 ` [PATCH 03/11] tools: install XEN_{LOG,RUN}_DIR Wei Liu
2016-06-09 13:13 ` Andrew Cooper
2016-06-09 14:04 ` Wei Liu
2016-06-09 15:47 ` Ian Jackson
2016-06-09 12:57 ` Wei Liu [this message]
2016-06-09 15:47 ` [PATCH 04/11] xenconsoled: honour XEN_LOG_DIR and remove hard-coded path Ian Jackson
2016-06-09 12:57 ` [PATCH 05/11] xenbackendd: honour XEN_{RUN,LOG}_DIR Wei Liu
2016-06-09 15:48 ` [PATCH 05/11] xenbackendd: honour XEN_{RUN, LOG}_DIR Ian Jackson
2016-06-09 12:57 ` [PATCH 06/11] libxc: honour XEN_LOG_DIR in xc_dom_core.c Wei Liu
2016-06-09 15:48 ` Ian Jackson
2016-06-09 12:57 ` [PATCH 07/11] hotplug/FreeBSD: honour XEN_{LOG, RUN}_DIR Wei Liu
2016-06-09 15:19 ` Roger Pau Monné
2016-06-09 15:49 ` Ian Jackson
2016-06-09 12:57 ` [PATCH 08/11] hotplug/Linux: honour XEN_LOG_DIR Wei Liu
2016-06-09 15:19 ` Roger Pau Monné
2016-06-09 15:49 ` Ian Jackson
2016-06-09 12:57 ` [PATCH 09/11] hotplug/NetBSD: honour XEN_{LOG, RUN}_DIR Wei Liu
2016-06-09 15:20 ` Roger Pau Monné
2016-06-09 15:49 ` Ian Jackson
2016-06-09 12:57 ` [PATCH 10/11] libxl: honour XEN_LOG_DIR Wei Liu
2016-06-09 15:45 ` Ian Jackson
2016-06-09 12:57 ` [PATCH 11/11] oxenstored: honour XEN_{LOG, RUN}_DIR in oxenstored.conf Wei Liu
2016-06-09 15:51 ` Ian Jackson
2016-06-09 20:38 ` David Scott
2016-06-10 9:45 ` Wei Liu
2016-06-10 9:49 ` Wei Liu
2016-06-10 14:25 ` [PATCH 0/2] Ocaml: get rid of hard-coded paths in source code Wei Liu
2016-06-10 14:25 ` [PATCH 1/2] oxenstored: generate a paths module Wei Liu
2016-06-10 20:27 ` David Scott
2016-06-10 14:25 ` [PATCH 2/2] oxenstored: honour XEN_LOG_DIR defined by configure Wei Liu
2016-06-10 18:44 ` Wei Liu
2016-06-10 20:26 ` David Scott
2016-06-13 6:52 ` Wei Liu
2016-06-09 13:16 ` [PATCH 00/11] Honour XEN_{LOG, RUN}_DIR in various places Andrew Cooper
2016-06-09 16:53 ` Anthony PERARD
2016-06-09 16:56 ` Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465477062-28805-5-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.