* [PATCH 1/7] xenconsoled: honour XEN_RUN_DIR
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
@ 2016-06-15 11:15 ` Wei Liu
2016-06-15 11:15 ` [PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c Wei Liu
` (6 subsequent siblings)
7 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2016-06-15 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Place the PID file under XEN_RUN_DIR by default. Note this change the
default location from /var/run to /var/run/xen.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/console/daemon/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c
index 20e3513..806d2fd 100644
--- a/tools/console/daemon/main.c
+++ b/tools/console/daemon/main.c
@@ -193,7 +193,7 @@ int main(int argc, char **argv)
increase_fd_limit();
if (!is_interactive) {
- daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid");
+ daemonize(pidfile ? pidfile : XEN_RUN_DIR "/xenconsoled.pid");
}
if (!xen_setup())
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
2016-06-15 11:15 ` [PATCH 1/7] xenconsoled: honour XEN_RUN_DIR Wei Liu
@ 2016-06-15 11:15 ` Wei Liu
2016-07-08 17:25 ` Ian Jackson
2016-06-15 11:15 ` [PATCH 3/7] hotplug/FreeBSD: honour XEN_RUN_DIR Wei Liu
` (5 subsequent siblings)
7 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2016-06-15 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Place the PID file under XEN_RUN_DIR. Note that this change the default
location from /var/run to /var/run/xen.
Generate a _paths.h as that is required to make this change work.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
.gitignore | 1 +
tools/helpers/Makefile | 7 +++++--
tools/helpers/init-xenstore-domain.c | 8 +++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index e019f2e..d4ffaa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,6 +145,7 @@ tools/flask/utils/flask-loadpolicy
tools/flask/utils/flask-setenforce
tools/flask/utils/flask-set-bool
tools/flask/utils/flask-label-pci
+tools/helpers/_paths.h
tools/helpers/init-xenstore-domain
tools/helpers/xen-init-dom0
tools/hotplug/common/hotplugpath.sh
diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile
index a05a368..5d444aa 100644
--- a/tools/helpers/Makefile
+++ b/tools/helpers/Makefile
@@ -28,7 +28,7 @@ all: $(PROGS)
xen-init-dom0: $(XEN_INIT_DOM0_OBJS)
$(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS)
-init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS)
+init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) _paths.h
$(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS)
.PHONY: install
@@ -41,6 +41,9 @@ endif
.PHONY: clean
clean:
- $(RM) -f *.o $(PROGS) $(DEPS)
+ $(RM) -f *.o $(PROGS) $(DEPS) _paths.h
distclean: clean
+
+genpath-target = $(call buildmakevars2header,_paths.h)
+$(eval $(genpath-target))
diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c
index 909542b..53b4b01 100644
--- a/tools/helpers/init-xenstore-domain.c
+++ b/tools/helpers/init-xenstore-domain.c
@@ -14,6 +14,7 @@
#include <xen-xsm/flask/flask.h>
#include "init-dom-json.h"
+#include "_paths.h"
static uint32_t domid = ~0;
static char *kernel;
@@ -316,10 +317,10 @@ int main(int argc, char** argv)
do_xs_write_dom(xsh, "memory/static-max", buf);
xs_close(xsh);
- fd = creat("/var/run/xenstored.pid", 0666);
+ fd = creat(XEN_RUN_DIR "/xenstored.pid", 0666);
if ( fd < 0 )
{
- fprintf(stderr, "Creating /var/run/xenstored.pid failed\n");
+ fprintf(stderr, "Creating " XEN_RUN_DIR "/xenstored.pid failed\n");
return 3;
}
rv = snprintf(buf, 16, "domid:%d\n", domid);
@@ -327,7 +328,8 @@ int main(int argc, char** argv)
close(fd);
if ( rv < 0 )
{
- fprintf(stderr, "Writing domid to /var/run/xenstored.pid failed\n");
+ fprintf(stderr,
+ "Writing domid to " XEN_RUN_DIR "/xenstored.pid failed\n");
return 3;
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c
2016-06-15 11:15 ` [PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c Wei Liu
@ 2016-07-08 17:25 ` Ian Jackson
2016-07-11 10:38 ` Wei Liu
0 siblings, 1 reply; 24+ messages in thread
From: Ian Jackson @ 2016-07-08 17:25 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Ian Jackson
Wei Liu writes ("[PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c"):
> Place the PID file under XEN_RUN_DIR. Note that this change the default
> location from /var/run to /var/run/xen.
>
> Generate a _paths.h as that is required to make this change work.
...
> -init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS)
> +init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) _paths.h
This dependency is surely wrong. It is the object(s) (ie, the
compile) that depend on _paths.h, not the executable (ie the link).
But otherwise this is fine.
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c
2016-07-08 17:25 ` Ian Jackson
@ 2016-07-11 10:38 ` Wei Liu
0 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2016-07-11 10:38 UTC (permalink / raw)
To: Ian Jackson; +Cc: Xen-devel, Wei Liu
On Fri, Jul 08, 2016 at 06:25:13PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c"):
> > Place the PID file under XEN_RUN_DIR. Note that this change the default
> > location from /var/run to /var/run/xen.
> >
> > Generate a _paths.h as that is required to make this change work.
> ...
> > -init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS)
> > +init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) _paths.h
>
> This dependency is surely wrong. It is the object(s) (ie, the
> compile) that depend on _paths.h, not the executable (ie the link).
>
Good catch. I will fix it in next version.
Wei.
> But otherwise this is fine.
>
> Thanks,
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 3/7] hotplug/FreeBSD: honour XEN_RUN_DIR
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
2016-06-15 11:15 ` [PATCH 1/7] xenconsoled: honour XEN_RUN_DIR Wei Liu
2016-06-15 11:15 ` [PATCH 2/7] tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c Wei Liu
@ 2016-06-15 11:15 ` Wei Liu
2016-06-15 16:18 ` Roger Pau Monné
2016-07-08 17:25 ` Ian Jackson
2016-06-15 11:15 ` [PATCH 4/7] hotplug/NetBSD: " Wei Liu
` (4 subsequent siblings)
7 siblings, 2 replies; 24+ messages in thread
From: Wei Liu @ 2016-06-15 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, Roger Pau Monné
Store xldevd.pid under XEN_RUN_DIR. Note that the default location would
change from /var/run to /var/run/xen.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Roger Pau Monné <roger.pau@citrix.com>
---
tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
index 4063c06..8ece7c3 100644
--- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
+++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
@@ -18,7 +18,7 @@ start_cmd="xendriverdomain_startcmd"
stop_cmd="xendriverdomain_stop"
extra_commands=""
-XLDEVD_PIDFILE="/var/run/xldevd.pid"
+XLDEVD_PIDFILE="@XEN_RUN_DIR@/xldevd.pid"
xendriverdomain_precmd()
{
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 4/7] hotplug/NetBSD: honour XEN_RUN_DIR
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
` (2 preceding siblings ...)
2016-06-15 11:15 ` [PATCH 3/7] hotplug/FreeBSD: honour XEN_RUN_DIR Wei Liu
@ 2016-06-15 11:15 ` Wei Liu
2016-06-15 16:16 ` Roger Pau Monné
2016-07-08 17:26 ` Ian Jackson
2016-06-15 11:15 ` [PATCH 5/7] hotplug/Linux: " Wei Liu
` (3 subsequent siblings)
7 siblings, 2 replies; 24+ messages in thread
From: Wei Liu @ 2016-06-15 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, Roger Pau Monné
Store xldevd.pid under XEN_RUN_DIR. Note that this will change the
default location from /var/run to /var/run/xen.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Roger Pau Monné <roger.pau@citrix.com>
---
tools/hotplug/NetBSD/rc.d/xendriverdomain.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/hotplug/NetBSD/rc.d/xendriverdomain.in b/tools/hotplug/NetBSD/rc.d/xendriverdomain.in
index 5062a71..f47b0b1 100644
--- a/tools/hotplug/NetBSD/rc.d/xendriverdomain.in
+++ b/tools/hotplug/NetBSD/rc.d/xendriverdomain.in
@@ -19,7 +19,7 @@ start_cmd="xendriverdomain_startcmd"
stop_cmd="xendriverdomain_stop"
extra_commands=""
-XLDEVD_PIDFILE="/var/run/xldevd.pid"
+XLDEVD_PIDFILE="@XEN_RUN_DIR@/xldevd.pid"
xendriverdomain_precmd()
{
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 5/7] hotplug/Linux: honour XEN_RUN_DIR
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
` (3 preceding siblings ...)
2016-06-15 11:15 ` [PATCH 4/7] hotplug/NetBSD: " Wei Liu
@ 2016-06-15 11:15 ` Wei Liu
2016-06-15 16:17 ` Roger Pau Monné
2016-07-08 17:26 ` Ian Jackson
2016-06-15 11:15 ` [PATCH 6/7] libxenstat: " Wei Liu
` (2 subsequent siblings)
7 siblings, 2 replies; 24+ messages in thread
From: Wei Liu @ 2016-06-15 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, Roger Pau Monné
Store various PID files under XEN_RUN_DIR. Note that this change the
default location from /var/run to /var/run/xen.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Roger Pau Monné <roger.pau@citrix.com>
---
tools/hotplug/Linux/init.d/xencommons.in | 6 +++---
tools/hotplug/Linux/init.d/xendriverdomain.in | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in
index 7b69fc2..2d8f30b 100644
--- a/tools/hotplug/Linux/init.d/xencommons.in
+++ b/tools/hotplug/Linux/init.d/xencommons.in
@@ -27,8 +27,8 @@ xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@
test -f $xencommons_config/xencommons && . $xencommons_config/xencommons
-XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
-QEMU_PIDFILE=/var/run/qemu-dom0.pid
+XENCONSOLED_PIDFILE=@XEN_RUN_DIR@/xenconsoled.pid
+QEMU_PIDFILE=@XEN_RUN_DIR@/qemu-dom0.pid
shopt -s extglob
# not running in Xen dom0 or domU
@@ -70,7 +70,7 @@ do_start () {
if [ -n "$XENSTORED" ] ; then
echo -n Starting $XENSTORED...
- $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
+ $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS
else
echo "No xenstored found"
exit 1
diff --git a/tools/hotplug/Linux/init.d/xendriverdomain.in b/tools/hotplug/Linux/init.d/xendriverdomain.in
index 8d4592a..c63060f 100644
--- a/tools/hotplug/Linux/init.d/xendriverdomain.in
+++ b/tools/hotplug/Linux/init.d/xendriverdomain.in
@@ -24,7 +24,7 @@ xendriverdomain_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@
test -f $xendriverdomain_config/xendriverdomain && . $xendriverdomain_config/xendriverdomain
-XLDEVD_PIDFILE=/var/run/xldevd.pid
+XLDEVD_PIDFILE=@XEN_RUN_DIR@/xldevd.pid
# not running in Xen dom0 or domU
if ! test -d /proc/xen ; then
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 6/7] libxenstat: honour XEN_RUN_DIR
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
` (4 preceding siblings ...)
2016-06-15 11:15 ` [PATCH 5/7] hotplug/Linux: " Wei Liu
@ 2016-06-15 11:15 ` Wei Liu
2016-07-08 17:27 ` Ian Jackson
2016-06-15 11:15 ` [PATCH 7/7] oxenstored: " Wei Liu
2016-07-02 10:21 ` [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
7 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2016-06-15 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
This is because libxl uses XEN_RUN_DIR to generate the socket path for
libxenstat while libxenstat itself uses hard-coded path, which is not
necessary in sync with libxl.
Generate a _paths.h because it is required to make this change work.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
.gitignore | 1 +
tools/xenstat/libxenstat/Makefile | 7 ++++++-
tools/xenstat/libxenstat/src/xenstat_qmp.c | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index d4ffaa6..9b8dece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -220,6 +220,7 @@ tools/xenmon/xentrace_setmask
tools/xenmon/xenbaked
tools/xenpaging/xenpaging
tools/xenpmd/xenpmd
+tools/xenstat/libxenstat/src/_paths.h
tools/xenstat/xentop/xentop
tools/xenstore/xenstore
tools/xenstore/xenstore-chmod
diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 850d24a..213d998 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -40,6 +40,8 @@ LDLIBS-$(CONFIG_SunOS) += -lkstat
.PHONY: all
all: $(LIB) $(SHLIB) $(SHLIB_LINKS)
+$(OBJECTS-y): src/_paths.h
+
$(LIB): $(OBJECTS-y)
$(AR) rc $@ $^
$(RANLIB) $@
@@ -135,9 +137,12 @@ endif
.PHONY: clean
clean:
rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
- $(BINDINGS) $(BINDINGSRC) $(DEPS)
+ $(BINDINGS) $(BINDINGSRC) $(DEPS) src/_paths.h
.PHONY: distclean
distclean: clean
-include $(DEPS)
+
+genpath-target = $(call buildmakevars2header,src/_paths.h)
+$(eval $(genpath-target))
diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
index c12929a..a87c937 100644
--- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
+++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
@@ -23,6 +23,7 @@
#include <xenctrl.h>
#include "xenstat_priv.h"
+#include "_paths.h"
#ifdef HAVE_YAJL_YAJL_VERSION_H
# include <yajl/yajl_version.h>
@@ -398,7 +399,7 @@ static void read_attributes_qdisk_dom(xenstat_node *node, domid_t domain)
free(val);
/* Connect to this VMs QMP socket */
- snprintf(path, sizeof(path), "/var/run/xen/qmp-libxenstat-%i", domain);
+ snprintf(path, sizeof(path), XEN_RUN_DIR "/qmp-libxenstat-%i", domain);
if ((qfd = qmp_connect(path)) < 0)
return;
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 6/7] libxenstat: honour XEN_RUN_DIR
2016-06-15 11:15 ` [PATCH 6/7] libxenstat: " Wei Liu
@ 2016-07-08 17:27 ` Ian Jackson
2016-07-11 10:38 ` Wei Liu
0 siblings, 1 reply; 24+ messages in thread
From: Ian Jackson @ 2016-07-08 17:27 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel
Wei Liu writes ("[PATCH 6/7] libxenstat: honour XEN_RUN_DIR"):
> This is because libxl uses XEN_RUN_DIR to generate the socket path for
> libxenstat while libxenstat itself uses hard-coded path, which is not
> necessary in sync with libxl.
This commit message is confusing (and perhaps ungrammatical). Is
there currently a bug here ?
Maybe this patch or something like it is a backport candidate ?
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 6/7] libxenstat: honour XEN_RUN_DIR
2016-07-08 17:27 ` Ian Jackson
@ 2016-07-11 10:38 ` Wei Liu
0 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2016-07-11 10:38 UTC (permalink / raw)
To: Ian Jackson; +Cc: Xen-devel, Wei Liu
On Fri, Jul 08, 2016 at 06:27:28PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH 6/7] libxenstat: honour XEN_RUN_DIR"):
> > This is because libxl uses XEN_RUN_DIR to generate the socket path for
> > libxenstat while libxenstat itself uses hard-coded path, which is not
> > necessary in sync with libxl.
>
which is not necessarily the same path as XEN_RUN_DIR.
> This commit message is confusing (and perhaps ungrammatical). Is
> there currently a bug here ?
>
> Maybe this patch or something like it is a backport candidate ?
>
There is no bug in the default configuration because XEN_RUN_DIR is
/var/run/xen by default. But if users chooses a different path the path
used in libxl and the path used in libxenstat will go out of sync hence
rendering libxenstat useless.
I think this is a backport candidate.
Wei.
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 7/7] oxenstored: honour XEN_RUN_DIR
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
` (5 preceding siblings ...)
2016-06-15 11:15 ` [PATCH 6/7] libxenstat: " Wei Liu
@ 2016-06-15 11:15 ` Wei Liu
2016-06-15 19:43 ` David Scott
2016-07-08 17:27 ` Ian Jackson
2016-07-02 10:21 ` [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
7 siblings, 2 replies; 24+ messages in thread
From: Wei Liu @ 2016-06-15 11:15 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, Dave Scott
Move default the pid file under XEN_RUN_DIR. Note that it changes the
location from /var/run to /var/run/xen.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Dave Scott <dave@recoil.org>
---
tools/ocaml/xenstored/xenstored.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml
index 30570ed..7ea4026 100644
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -81,7 +81,7 @@ let config_filename cf =
| Some name -> name
| None -> Define.default_config_dir ^ "/oxenstored.conf"
-let default_pidfile = "/var/run/xenstored.pid"
+let default_pidfile = Paths.xen_run_dir ^ "/xenstored.pid"
let ring_scan_interval = ref 20
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR
2016-06-15 11:15 ` [PATCH 7/7] oxenstored: " Wei Liu
@ 2016-06-15 19:43 ` David Scott
2016-07-08 17:27 ` Ian Jackson
1 sibling, 0 replies; 24+ messages in thread
From: David Scott @ 2016-06-15 19:43 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Ian Jackson
> On 15 Jun 2016, at 12:15, Wei Liu <wei.liu2@citrix.com> wrote:
>
> Move default the pid file under XEN_RUN_DIR. Note that it changes the
> location from /var/run to /var/run/xen.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Dave Scott <dave@recoil.org>
> ---
> tools/ocaml/xenstored/xenstored.ml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml
> index 30570ed..7ea4026 100644
> --- a/tools/ocaml/xenstored/xenstored.ml
> +++ b/tools/ocaml/xenstored/xenstored.ml
> @@ -81,7 +81,7 @@ let config_filename cf =
> | Some name -> name
> | None -> Define.default_config_dir ^ "/oxenstored.conf"
>
> -let default_pidfile = "/var/run/xenstored.pid"
> +let default_pidfile = Paths.xen_run_dir ^ "/xenstored.pid"
>
> let ring_scan_interval = ref 20
>
> --
> 2.1.4
>
Looks fine to me.
Acked-by: David Scott <dave@recoil.org>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR
2016-06-15 11:15 ` [PATCH 7/7] oxenstored: " Wei Liu
2016-06-15 19:43 ` David Scott
@ 2016-07-08 17:27 ` Ian Jackson
2016-07-08 17:28 ` Ian Jackson
1 sibling, 1 reply; 24+ messages in thread
From: Ian Jackson @ 2016-07-08 17:27 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Dave Scott
Wei Liu writes ("[PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> Move default the pid file under XEN_RUN_DIR. Note that it changes the
> location from /var/run to /var/run/xen.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR
2016-07-08 17:27 ` Ian Jackson
@ 2016-07-08 17:28 ` Ian Jackson
2016-07-11 10:38 ` Wei Liu
0 siblings, 1 reply; 24+ messages in thread
From: Ian Jackson @ 2016-07-08 17:28 UTC (permalink / raw)
To: Wei Liu, Xen-devel, Dave Scott
Ian Jackson writes ("Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> Wei Liu writes ("[PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> > Move default the pid file under XEN_RUN_DIR. Note that it changes the
> > location from /var/run to /var/run/xen.
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Actually, shouldn't this be combined with some init script patch, as
otherwise the tree is not bisectable ?
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR
2016-07-08 17:28 ` Ian Jackson
@ 2016-07-11 10:38 ` Wei Liu
0 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2016-07-11 10:38 UTC (permalink / raw)
To: Ian Jackson; +Cc: Xen-devel, Wei Liu, Dave Scott
On Fri, Jul 08, 2016 at 06:28:40PM +0100, Ian Jackson wrote:
> Ian Jackson writes ("Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> > Wei Liu writes ("[PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> > > Move default the pid file under XEN_RUN_DIR. Note that it changes the
> > > location from /var/run to /var/run/xen.
> >
> > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
>
> Actually, shouldn't this be combined with some init script patch, as
> otherwise the tree is not bisectable ?
>
There is no init script to modify because oxenstored uses these paths in
code by default.
Wei.
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 0/7] Honour more configure variables in various places (iteration 3)
2016-06-15 11:15 [PATCH 0/7] Honour more configure variables in various places (iteration 3) Wei Liu
` (6 preceding siblings ...)
2016-06-15 11:15 ` [PATCH 7/7] oxenstored: " Wei Liu
@ 2016-07-02 10:21 ` Wei Liu
2016-07-08 17:25 ` Ian Jackson
7 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2016-07-02 10:21 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu
Ian, ping?
On Wed, Jun 15, 2016 at 12:15:02PM +0100, Wei Liu wrote:
> This series deals with hard-coded /var/run in code.
>
> Wei Liu (7):
> xenconsoled: honour XEN_RUN_DIR
> tools/helper: honour XEN_RUN_DIR in init-xenstore-domain.c
> hotplug/FreeBSD: honour XEN_RUN_DIR
> hotplug/NetBSD: honour XEN_RUN_DIR
> hotplug/Linux: honour XEN_RUN_DIR
> libxenstat: honour XEN_RUN_DIR
> oxenstored: honour XEN_RUN_DIR
>
> .gitignore | 2 ++
> tools/console/daemon/main.c | 2 +-
> tools/helpers/Makefile | 7 +++++--
> tools/helpers/init-xenstore-domain.c | 8 +++++---
> tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 2 +-
> tools/hotplug/Linux/init.d/xencommons.in | 6 +++---
> tools/hotplug/Linux/init.d/xendriverdomain.in | 2 +-
> tools/hotplug/NetBSD/rc.d/xendriverdomain.in | 2 +-
> tools/ocaml/xenstored/xenstored.ml | 2 +-
> tools/xenstat/libxenstat/Makefile | 7 ++++++-
> tools/xenstat/libxenstat/src/xenstat_qmp.c | 3 ++-
> 11 files changed, 28 insertions(+), 15 deletions(-)
>
> --
> 2.1.4
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 24+ messages in thread