* [PATCH 01/17] oxenstored: honour XEN_{LOG, RUN}_DIR in oxenstored.conf
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
@ 2016-06-13 7:48 ` Wei Liu
2016-06-13 7:49 ` [PATCH 02/17] oxenstored: generate a paths module Wei Liu
` (16 subsequent siblings)
17 siblings, 0 replies; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:48 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu
Generate oxenstored.conf with configure. This involves modifying
tools/configure.ac and rerun autogen.sh.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
.gitignore | 1 +
tools/configure | 3 ++-
tools/configure.ac | 1 +
tools/ocaml/xenstored/{oxenstored.conf => oxenstored.conf.in} | 6 +++---
4 files changed, 7 insertions(+), 4 deletions(-)
rename tools/ocaml/xenstored/{oxenstored.conf => oxenstored.conf.in} (84%)
diff --git a/.gitignore b/.gitignore
index af0e0a8..39deb2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -346,6 +346,7 @@ tools/ocaml/libs/xentoollog/_xtl_levels.*
tools/ocaml/libs/xentoollog/xentoollog.ml
tools/ocaml/libs/xentoollog/xentoollog.mli
tools/ocaml/xenstored/oxenstored
+tools/ocaml/xenstored/oxenstored.conf
tools/ocaml/test/xtl
tools/ocaml/test/send_debug_keys
tools/ocaml/test/list_domains
diff --git a/tools/configure b/tools/configure
index a80f132..42e07a6 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2408,7 +2408,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in"
+ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in ocaml/xenstored/oxenstored.conf"
ac_config_headers="$ac_config_headers config.h"
@@ -10374,6 +10374,7 @@ do
"hotplug/NetBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xendriverdomain" ;;
"libxl/xenlight.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xenlight.pc.in" ;;
"libxl/xlutil.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xlutil.pc.in" ;;
+ "ocaml/xenstored/oxenstored.conf") CONFIG_FILES="$CONFIG_FILES ocaml/xenstored/oxenstored.conf" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/proc-xen.mount" ;;
"hotplug/Linux/systemd/var-lib-xenstored.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/var-lib-xenstored.mount" ;;
diff --git a/tools/configure.ac b/tools/configure.ac
index d0c9e63..2e5c95c 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -21,6 +21,7 @@ hotplug/NetBSD/rc.d/xencommons
hotplug/NetBSD/rc.d/xendriverdomain
libxl/xenlight.pc.in
libxl/xlutil.pc.in
+ocaml/xenstored/oxenstored.conf
])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([../])
diff --git a/tools/ocaml/xenstored/oxenstored.conf b/tools/ocaml/xenstored/oxenstored.conf.in
similarity index 84%
rename from tools/ocaml/xenstored/oxenstored.conf
rename to tools/ocaml/xenstored/oxenstored.conf.in
index ac60f49..82117a9 100644
--- a/tools/ocaml/xenstored/oxenstored.conf
+++ b/tools/ocaml/xenstored/oxenstored.conf.in
@@ -1,7 +1,7 @@
# default xenstored config
# Where the pid file is stored
-pid-file = /var/run/xenstored.pid
+pid-file = @XEN_RUN_DIR@/xenstored.pid
# Randomly failed a transaction with EAGAIN. Used for testing Xs user
test-eagain = false
@@ -24,12 +24,12 @@ quota-maxrequests = 1024
persistent = false
# Xenstored logs
-# xenstored-log-file = /var/log/xenstored.log
+# xenstored-log-file = @XEN_LOG_DIR@/xenstored.log
# xenstored-log-level = null
# xenstored-log-nb-files = 10
# Xenstored access logs
-# access-log-file = /var/log/xenstored-access.log
+# access-log-file = @XEN_LOG_DIR@/xenstored-access.log
# access-log-nb-lines = 13215
# acesss-log-nb-chars = 180
# access-log-special-ops = false
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 02/17] oxenstored: generate a paths module
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
2016-06-13 7:48 ` [PATCH 01/17] oxenstored: honour XEN_{LOG, RUN}_DIR in oxenstored.conf Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 7:49 ` [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure Wei Liu
` (15 subsequent siblings)
17 siblings, 0 replies; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, David Scot
That file includes all paths generated by configure. It will be used to
get rid of hard-coded paths in code.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: David Scot <dave@recoil.org>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: David Scot <dave@recoil.org>
---
.gitignore | 1 +
tools/ocaml/Makefile.rules | 11 +++++++++++
tools/ocaml/xenstored/Makefile | 8 +++++++-
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 39deb2d..e4afda3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -347,6 +347,7 @@ tools/ocaml/libs/xentoollog/xentoollog.ml
tools/ocaml/libs/xentoollog/xentoollog.mli
tools/ocaml/xenstored/oxenstored
tools/ocaml/xenstored/oxenstored.conf
+tools/ocaml/xenstored/paths.ml
tools/ocaml/test/xtl
tools/ocaml/test/send_debug_keys
tools/ocaml/test/list_domains
diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules
index 1796060..a893c42 100644
--- a/tools/ocaml/Makefile.rules
+++ b/tools/ocaml/Makefile.rules
@@ -95,3 +95,14 @@ $(foreach lib,$(OCAML_LIBRARY),$(eval $(call OCAML_LIBRARY_template,$(lib))))
$(foreach lib,$(OCAML_NOC_LIBRARY),$(eval $(call OCAML_NOC_LIBRARY_template,$(lib))))
$(foreach p,$(OCAML_PROGRAM),$(eval $(call OCAML_PROGRAM_template,$(p))))
$(foreach p,$(C_PROGRAM),$(eval $(call C_PROGRAM_template,$(p))))
+
+buildmakevars2module = $(eval $(call buildmakevars2module-closure,$(1)))
+define buildmakevars2module-closure
+ $(1): .phony
+ rm -f $(1).tmp; \
+ $(foreach var, $(BUILD_MAKE_VARS), \
+ printf "let %s = \"%s\";;\n" \
+ $(shell echo $(var) | tr '[:upper:]' '[:lower:]') \
+ $($(var)) >>$(1).tmp;) \
+ $(call move-if-changed,$(1).tmp,$(1))
+endef
diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
index dce9e70..939dcaa 100644
--- a/tools/ocaml/xenstored/Makefile
+++ b/tools/ocaml/xenstored/Makefile
@@ -32,7 +32,8 @@ OCAML_LIBRARY += systemd
LIBS_systemd += $(LDFLAGS-y)
-OBJS = define \
+OBJS = paths \
+ define \
stdext \
trie \
config \
@@ -87,3 +88,8 @@ install: all
$(INSTALL_DATA) oxenstored.conf $(DESTDIR)$(XEN_CONFIG_DIR)
include $(OCAML_TOPLEVEL)/Makefile.rules
+
+genpath-target = $(call buildmakevars2module,paths.ml)
+$(eval $(genpath-target))
+
+GENERATED_FILES += paths.ml
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
2016-06-13 7:48 ` [PATCH 01/17] oxenstored: honour XEN_{LOG, RUN}_DIR in oxenstored.conf Wei Liu
2016-06-13 7:49 ` [PATCH 02/17] oxenstored: generate a paths module Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 10:07 ` Andrew Cooper
2016-06-13 7:49 ` [PATCH 04/17] build: introduce and export XEN_LIB_DIR Wei Liu
` (14 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, David Scot
We generate a corresponding constant (in lower case) in paths.ml. Use
that in source code to get rid of hard-coded path.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: David Scot <dave@recoil.org>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: David Scot <dave@recoil.org>
---
tools/ocaml/xenstored/logging.ml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/ocaml/xenstored/logging.ml b/tools/ocaml/xenstored/logging.ml
index 4c90032..c52f03d 100644
--- a/tools/ocaml/xenstored/logging.ml
+++ b/tools/ocaml/xenstored/logging.ml
@@ -154,7 +154,7 @@ let make_syslog_logger facility =
Syslog.log facility level s in
{ stop = nothing; restart = nothing; rotate = nothing; write=write }
-let xenstored_log_destination = ref (File "/var/log/xenstored.log")
+let xenstored_log_destination = ref (File (Paths.xen_log_dir ^ "/xenstored.log"))
let xenstored_log_level = ref Warn
let xenstored_log_nb_files = ref 10
let xenstored_log_nb_lines = ref 13215
@@ -262,7 +262,7 @@ let sanitize_data data =
String.escaped data
let activate_access_log = ref true
-let access_log_destination = ref (File "/var/log/xenstored-access.log")
+let access_log_destination = ref (File (Paths.xen_log_dir ^ "/xenstored-access.log"))
let access_log_nb_files = ref 20
let access_log_nb_lines = ref 13215
let access_log_nb_chars = ref 180
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure
2016-06-13 7:49 ` [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure Wei Liu
@ 2016-06-13 10:07 ` Andrew Cooper
2016-06-13 10:34 ` Wei Liu
0 siblings, 1 reply; 48+ messages in thread
From: Andrew Cooper @ 2016-06-13 10:07 UTC (permalink / raw)
To: Wei Liu, Xen-devel; +Cc: Ian Jackson, David Scot
On 13/06/16 08:49, Wei Liu wrote:
> We generate a corresponding constant (in lower case) in paths.ml. Use
> that in source code to get rid of hard-coded path.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Acked-by: David Scot <dave@recoil.org>
You have dropped a 't'.
You should also note in the commit message that this alters where
oxenstored puts its log files.
~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure
2016-06-13 10:07 ` Andrew Cooper
@ 2016-06-13 10:34 ` Wei Liu
0 siblings, 0 replies; 48+ messages in thread
From: Wei Liu @ 2016-06-13 10:34 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Xen-devel, Wei Liu, Ian Jackson, David Scot
On Mon, Jun 13, 2016 at 11:07:19AM +0100, Andrew Cooper wrote:
> On 13/06/16 08:49, Wei Liu wrote:
> > We generate a corresponding constant (in lower case) in paths.ml. Use
> > that in source code to get rid of hard-coded path.
> >
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > Acked-by: David Scot <dave@recoil.org>
>
> You have dropped a 't'.
>
Oops, yes -- and I c&p this to various other patch. Sorry Dave.
I will fix this.
> You should also note in the commit message that this alters where
> oxenstored puts its log files.
>
Ack.
Wei.
> ~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH 04/17] build: introduce and export XEN_LIB_DIR
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (2 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:10 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile Wei Liu
` (13 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
This variable defaults to /var/lib/xen. It will be used to substitute
various hard-coded paths in tools.
The new variable points to $localstatedir/lib/xen, which defaults to
/var/lib/xen, so there is no change in default configuration.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Need to rerun autogen.sh
---
Config.mk | 3 ++-
config/Paths.mk.in | 1 +
configure | 4 ++++
m4/paths.m4 | 3 +++
tools/configure | 4 ++++
5 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/Config.mk b/Config.mk
index 381c21a..a4af50b 100644
--- a/Config.mk
+++ b/Config.mk
@@ -181,7 +181,8 @@ endef
BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \
XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \
- XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR XEN_LOG_DIR
+ XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR XEN_LOG_DIR \
+ XEN_LIB_DIR
buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))
define buildmakevars2file-closure
diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 1c7afb4..f185f87 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -40,6 +40,7 @@ MAN8DIR := $(mandir)/man8
XEN_RUN_DIR := @XEN_RUN_DIR@
XEN_LOG_DIR := @XEN_LOG_DIR@
+XEN_LIB_DIR := @XEN_LIB_DIR@
XEN_LIB_STORED := @XEN_LIB_STORED@
CONFIG_DIR := @CONFIG_DIR@
diff --git a/configure b/configure
index ebc55ad..6782100 100755
--- a/configure
+++ b/configure
@@ -603,6 +603,7 @@ XEN_CONFIG_DIR
INITD_DIR
CONFIG_DIR
SHAREDIR
+XEN_LIB_DIR
XEN_LIB_STORED
XEN_LOG_DIR
XEN_RUN_DIR
@@ -1980,6 +1981,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
XEN_LIB_STORED=$localstatedir/lib/xenstored
+XEN_LIB_DIR=$localstatedir/lib/xen
+
+
SHAREDIR=$prefix/share
diff --git a/m4/paths.m4 b/m4/paths.m4
index fa902bb..1c444c4 100644
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -107,6 +107,9 @@ AC_SUBST(XEN_LOG_DIR)
XEN_LIB_STORED=$localstatedir/lib/xenstored
AC_SUBST(XEN_LIB_STORED)
+XEN_LIB_DIR=$localstatedir/lib/xen
+AC_SUBST(XEN_LIB_DIR)
+
SHAREDIR=$prefix/share
AC_SUBST(SHAREDIR)
diff --git a/tools/configure b/tools/configure
index 42e07a6..7d16f67 100755
--- a/tools/configure
+++ b/tools/configure
@@ -722,6 +722,7 @@ XEN_CONFIG_DIR
INITD_DIR
CONFIG_DIR
SHAREDIR
+XEN_LIB_DIR
XEN_LIB_STORED
XEN_LOG_DIR
XEN_RUN_DIR
@@ -3939,6 +3940,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
XEN_LIB_STORED=$localstatedir/lib/xenstored
+XEN_LIB_DIR=$localstatedir/lib/xen
+
+
SHAREDIR=$prefix/share
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (3 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 04/17] build: introduce and export XEN_LIB_DIR Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:11 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 06/17] hotplug/Linux: honour XEN_LIB_DIR Wei Liu
` (12 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
The intention of using wild card in uninstall target is to remove both
xen and xenstored directories. Change that to two runes that explicitly
remove each of those directories.
Note that the runes that use hard-coded paths are kept for now to keep
the tree bisectable as I replace hard-coded paths component by
component. Those runes will be removed eventually.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/Makefile b/tools/Makefile
index d43a229..cb0817a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -64,6 +64,7 @@ install: subdirs-install
$(INSTALL_DIR) $(DESTDIR)$(XEN_LOG_DIR)
$(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
$(INSTALL_DIR) $(DESTDIR)/var/lib/xen
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_DIR)
.PHONY: uninstall
uninstall: D=$(DESTDIR)
@@ -77,6 +78,8 @@ uninstall:
rm -f $(D)$(sbindir)/xendomains
rm -f $(D)$(SYSCONFIG_DIR)/xencommons
rm -rf $(D)/var/lib/xen*
+ rm -rf $(D)$(XEN_LIB_DIR)
+ rm -rf $(D)$(XEN_LIB_STORED)
rm -rf $(D)$(bindir)/cpuperf-perfcntr $(D)$(bindir)/cpuperf-xen
rm -rf $(D)$(bindir)/xc_shadow
rm -rf $(D)$(bindir)/pygrub
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile
2016-06-13 7:49 ` [PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile Wei Liu
@ 2016-06-13 15:11 ` Ian Jackson
0 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2016-06-13 15:11 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel
Wei Liu writes ("[PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile"):
> The intention of using wild card in uninstall target is to remove both
> xen and xenstored directories. Change that to two runes that explicitly
> remove each of those directories.
>
> Note that the runes that use hard-coded paths are kept for now to keep
> the tree bisectable as I replace hard-coded paths component by
> component. Those runes will be removed eventually.
Thanks for the attention to upgrade compatibility.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH 06/17] hotplug/Linux: honour XEN_LIB_DIR
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (4 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:12 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 07/17] libxl: " Wei Liu
` (11 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Use configure to generate sysconfig.xendomains file.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
I've committed the result of autogen.sh. Rerun autogen.sh if necessary.
---
.gitignore | 1 +
tools/configure | 3 ++-
tools/configure.ac | 1 +
.../Linux/init.d/{sysconfig.xendomains => sysconfig.xendomains.in} | 4 ++--
4 files changed, 6 insertions(+), 3 deletions(-)
rename tools/hotplug/Linux/init.d/{sysconfig.xendomains => sysconfig.xendomains.in} (98%)
diff --git a/.gitignore b/.gitignore
index e4afda3..496194f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,6 +149,7 @@ tools/hotplug/common/hotplugpath.sh
tools/hotplug/FreeBSD/rc.d/xencommons
tools/hotplug/FreeBSD/rc.d/xendriverdomain
tools/hotplug/Linux/init.d/sysconfig.xencommons
+tools/hotplug/Linux/init.d/sysconfig.xendomains
tools/hotplug/Linux/init.d/xen-watchdog
tools/hotplug/Linux/init.d/xencommons
tools/hotplug/Linux/init.d/xendomains
diff --git a/tools/configure b/tools/configure
index 7d16f67..86f1a81 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2409,7 +2409,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in ocaml/xenstored/oxenstored.conf"
+ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/sysconfig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in ocaml/xenstored/oxenstored.conf"
ac_config_headers="$ac_config_headers config.h"
@@ -10367,6 +10367,7 @@ do
"hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xencommons" ;;
"hotplug/FreeBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xendriverdomain" ;;
"hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;;
+ "hotplug/Linux/init.d/sysconfig.xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xendomains" ;;
"hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xen-watchdog" ;;
"hotplug/Linux/init.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons" ;;
"hotplug/Linux/init.d/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xendomains" ;;
diff --git a/tools/configure.ac b/tools/configure.ac
index 2e5c95c..8704927 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -10,6 +10,7 @@ AC_CONFIG_FILES([
hotplug/FreeBSD/rc.d/xencommons
hotplug/FreeBSD/rc.d/xendriverdomain
hotplug/Linux/init.d/sysconfig.xencommons
+hotplug/Linux/init.d/sysconfig.xendomains
hotplug/Linux/init.d/xen-watchdog
hotplug/Linux/init.d/xencommons
hotplug/Linux/init.d/xendomains
diff --git a/tools/hotplug/Linux/init.d/sysconfig.xendomains b/tools/hotplug/Linux/init.d/sysconfig.xendomains.in
similarity index 98%
rename from tools/hotplug/Linux/init.d/sysconfig.xendomains
rename to tools/hotplug/Linux/init.d/sysconfig.xendomains.in
index 031cdb7..f61ef9c 100644
--- a/tools/hotplug/Linux/init.d/sysconfig.xendomains
+++ b/tools/hotplug/Linux/init.d/sysconfig.xendomains.in
@@ -45,7 +45,7 @@ XENDOMAINS_CREATE_USLEEP=5000000
XENDOMAINS_MIGRATE=""
## Type: string
-## Default: /var/lib/xen/save
+## Default: @XEN_LIB_DIR@/save
#
# Directory to save running domains to when the system (dom0) is
# shut down. Will also be used to restore domains from if # XENDOMAINS_RESTORE
@@ -53,7 +53,7 @@ XENDOMAINS_MIGRATE=""
# (e.g. because you rather shut domains down).
# If domain saving does succeed, SHUTDOWN will not be executed.
#
-XENDOMAINS_SAVE=/var/lib/xen/save
+XENDOMAINS_SAVE=@XEN_LIB_DIR@/save
## Type: string
## Default: "--wait"
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 07/17] libxl: honour XEN_LIB_DIR
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (5 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 06/17] hotplug/Linux: honour XEN_LIB_DIR Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:12 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile Wei Liu
` (10 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/libxl/libxl_dom.c | 4 +++-
tools/libxl/libxl_internal.h | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 805774f..ec29060 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -25,6 +25,8 @@
#include <xen/hvm/hvm_xs_strings.h>
#include <xen/hvm/e820.h>
+#include "_paths.h"
+
libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -1129,7 +1131,7 @@ const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid,
goto out;
}
uuid_string = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid));
- path = GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s",
+ path = GCSPRINTF(XEN_LIB_DIR "/userdata-%s.%u.%s.%s",
wh, domid, uuid_string, userdata_userid);
out:
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index ae16c25..6c61b66 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -93,8 +93,8 @@
/* QEMU may be slow to load and start due to a bug in Linux where the I/O
* subsystem sometime produce high latency under load. */
#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60
-#define LIBXL_DEVICE_MODEL_SAVE_FILE "/var/lib/xen/qemu-save" /* .$domid */
-#define LIBXL_DEVICE_MODEL_RESTORE_FILE "/var/lib/xen/qemu-resume" /* .$domid */
+#define LIBXL_DEVICE_MODEL_SAVE_FILE XEN_LIB_DIR "/qemu-save" /* .$domid */
+#define LIBXL_DEVICE_MODEL_RESTORE_FILE XEN_LIB_DIR "/qemu-resume" /* .$domid */
#define LIBXL_STUBDOM_START_TIMEOUT 30
#define LIBXL_QEMU_BODGE_TIMEOUT 2
#define LIBXL_XENCONSOLE_LIMIT 1048576
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (6 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 07/17] libxl: " Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:13 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 09/17] docs: honour XEN_DUMP_DIR Wei Liu
` (9 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Now all conversations are done, remove the hard-coded paths.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/Makefile | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index cb0817a..cc45758 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -63,7 +63,6 @@ install: subdirs-install
$(INSTALL_DIR) -m 700 $(DESTDIR)$(XEN_DUMP_DIR)
$(INSTALL_DIR) $(DESTDIR)$(XEN_LOG_DIR)
$(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
$(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_DIR)
.PHONY: uninstall
@@ -77,7 +76,6 @@ uninstall:
rm -f $(D)$(SYSCONFIG_DIR)/xendomains
rm -f $(D)$(sbindir)/xendomains
rm -f $(D)$(SYSCONFIG_DIR)/xencommons
- rm -rf $(D)/var/lib/xen*
rm -rf $(D)$(XEN_LIB_DIR)
rm -rf $(D)$(XEN_LIB_STORED)
rm -rf $(D)$(bindir)/cpuperf-perfcntr $(D)$(bindir)/cpuperf-xen
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile
2016-06-13 7:49 ` [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile Wei Liu
@ 2016-06-13 15:13 ` Ian Jackson
2016-06-13 15:29 ` Wei Liu
0 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2016-06-13 15:13 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel
Wei Liu writes ("[PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile"):
> Now all conversations are done, remove the hard-coded paths.
Should we not keep these for (most of) a release cycle ?
Otherwise someone who tries to use the new feature in 4.8 will find it
doesn't uninstall their previous install.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile
2016-06-13 15:13 ` Ian Jackson
@ 2016-06-13 15:29 ` Wei Liu
2016-06-13 16:07 ` Ian Jackson
0 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 15:29 UTC (permalink / raw)
To: Ian Jackson; +Cc: Xen-devel, Wei Liu
On Mon, Jun 13, 2016 at 04:13:26PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile"):
> > Now all conversations are done, remove the hard-coded paths.
>
> Should we not keep these for (most of) a release cycle ?
>
> Otherwise someone who tries to use the new feature in 4.8 will find it
> doesn't uninstall their previous install.
>
TBH I think the uninstall target has been broken for a long time. I
merely added the rm rune for completeness. Last time I tried it didn't
remove things cleanly. For one there is no rune to remove systemd unit
files.
For now, I'm fine with keeping the uninstall target rune.
Wei.
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile
2016-06-13 15:29 ` Wei Liu
@ 2016-06-13 16:07 ` Ian Jackson
2016-06-13 16:33 ` Wei Liu
0 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2016-06-13 16:07 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel
Wei Liu writes ("Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile"):
> TBH I think the uninstall target has been broken for a long time. I
> merely added the rm rune for completeness. Last time I tried it didn't
> remove things cleanly. For one there is no rune to remove systemd unit
> files.
Mmmm. So maybe we should just drop this now.
> For now, I'm fine with keeping the uninstall target rune.
It might sit there forever and eventually remove some wrong thing...
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile
2016-06-13 16:07 ` Ian Jackson
@ 2016-06-13 16:33 ` Wei Liu
2016-06-13 16:57 ` Ian Jackson
0 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 16:33 UTC (permalink / raw)
To: Ian Jackson; +Cc: Xen-devel, Wei Liu
On Mon, Jun 13, 2016 at 05:07:11PM +0100, Ian Jackson wrote:
> Wei Liu writes ("Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile"):
> > TBH I think the uninstall target has been broken for a long time. I
> > merely added the rm rune for completeness. Last time I tried it didn't
> > remove things cleanly. For one there is no rune to remove systemd unit
> > files.
>
> Mmmm. So maybe we should just drop this now.
Drop what? Drop the uninstall target all together? Or just the rune in
this patch?
>
> > For now, I'm fine with keeping the uninstall target rune.
>
> It might sit there forever and eventually remove some wrong thing...
>
Indeed.
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile
2016-06-13 16:33 ` Wei Liu
@ 2016-06-13 16:57 ` Ian Jackson
2016-06-13 18:16 ` Wei Liu
0 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2016-06-13 16:57 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel
Wei Liu writes ("Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile"):
> On Mon, Jun 13, 2016 at 05:07:11PM +0100, Ian Jackson wrote:
> > Mmmm. So maybe we should just drop this now.
>
> Drop what? Drop the uninstall target all together? Or just the rune in
> this patch?
I meant we should keep this patch and therefore drop the rune that is
being deleted by this patch.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile
2016-06-13 16:57 ` Ian Jackson
@ 2016-06-13 18:16 ` Wei Liu
2016-06-14 9:56 ` Ian Jackson
0 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 18:16 UTC (permalink / raw)
To: Ian Jackson; +Cc: Xen-devel, Wei Liu
On Mon, Jun 13, 2016 at 05:57:26PM +0100, Ian Jackson wrote:
> Wei Liu writes ("Re: [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile"):
> > On Mon, Jun 13, 2016 at 05:07:11PM +0100, Ian Jackson wrote:
> > > Mmmm. So maybe we should just drop this now.
> >
> > Drop what? Drop the uninstall target all together? Or just the rune in
> > this patch?
>
> I meant we should keep this patch and therefore drop the rune that is
> being deleted by this patch.
>
Does that mean you're satisfied with this patch? Can I translate this
thread into an ack?
Wei.
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH 09/17] docs: honour XEN_DUMP_DIR
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (7 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:15 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 10/17] build: introduce XEN_RUN_STORED Wei Liu
` (8 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Use configure to generate xl.cfg and xl manpage. Add the generated files
to gitignore.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Not entirely sure if this is a good idea. I don't deem this patch
important so I'm fine with dropping it.
I've committed the result of running autogen.sh here. Please rerun
autogen.sh if necessary.
---
.gitignore | 2 +
docs/configure | 184 ++++++++++++++++++++++++++++-
docs/configure.ac | 9 +-
docs/man/{xl.cfg.pod.5 => xl.cfg.pod.5.in} | 6 +-
docs/man/{xl.pod.1 => xl.pod.1.in} | 2 +-
5 files changed, 197 insertions(+), 6 deletions(-)
rename docs/man/{xl.cfg.pod.5 => xl.cfg.pod.5.in} (99%)
rename docs/man/{xl.pod.1 => xl.pod.1.in} (99%)
diff --git a/.gitignore b/.gitignore
index 496194f..8e0a177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,8 @@ config/Paths.mk
build-*
dist/*
docs/html/
+docs/man/xl.cfg.pod.5
+docs/man/xl.pod.1
docs/man1/
docs/man5/
docs/man8/
diff --git a/docs/configure b/docs/configure
index fbb78ac..46f0e68 100755
--- a/docs/configure
+++ b/docs/configure
@@ -594,6 +594,24 @@ POD2TEXT
POD2HTML
POD2MAN
FIG2DEV
+XEN_DUMP_DIR
+XEN_PAGING_DIR
+XEN_LOCK_DIR
+XEN_SCRIPT_DIR
+XEN_CONFIG_DIR
+INITD_DIR
+CONFIG_DIR
+SHAREDIR
+XEN_LIB_DIR
+XEN_LIB_STORED
+XEN_LOG_DIR
+XEN_RUN_DIR
+XENFIRMWAREDIR
+LIBEXEC_INC
+LIBEXEC_LIB
+LIBEXEC_BIN
+LIBEXEC
+CONFIG_LEAF_DIR
target_alias
host_alias
build_alias
@@ -635,6 +653,10 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+with_initddir
+with_sysconfig_leaf_dir
+with_libexec_leaf_dir
+with_xen_dumpdir
'
ac_precious_vars='build_alias
host_alias
@@ -1251,6 +1273,21 @@ if test -n "$ac_init_help"; then
esac
cat <<\_ACEOF
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-initddir=DIR Path to directory with sysv runlevel scripts.
+ [SYSCONFDIR/init.d]
+ --with-sysconfig-leaf-dir=SUBDIR
+ Name of subdirectory in /etc to store runtime
+ options for runlevel scripts and daemons such as
+ xenstored. This should be either "sysconfig" or
+ "default". [sysconfig]
+ --with-libexec-leaf-dir=SUBDIR
+ Name of subdirectory in libexecdir to use.
+ --with-xen-dumpdir=DIR Path to directory for domU crash dumps.
+ [LOCALSTATEDIR/lib/xen/dump]
+
Some influential environment variables:
FIG2DEV Path to fig2dev tool
POD2MAN Path to pod2man tool
@@ -1693,7 +1730,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_files="$ac_config_files ../config/Docs.mk"
+ac_config_files="$ac_config_files ../config/Docs.mk man/xl.cfg.pod.5 man/xl.pod.1"
ac_aux_dir=
for ac_dir in ../ "$srcdir"/../; do
@@ -1741,6 +1778,149 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
+test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix}
+
+if test "$localstatedir" = '${prefix}/var' ; then
+ localstatedir=/var
+fi
+
+bindir=`eval echo $bindir`
+sbindir=`eval echo $sbindir`
+libdir=`eval echo $libdir`
+
+if test "x$sysconfdir" = 'x${prefix}/etc' ; then
+ case "$host_os" in
+ *freebsd*)
+ sysconfdir=$prefix/etc
+ ;;
+ *solaris*)
+ if test "$prefix" = "/usr" ; then
+ sysconfdir=/etc
+ else
+ sysconfdir=$prefix/etc
+ fi
+ ;;
+ *)
+ sysconfdir=/etc
+ ;;
+ esac
+fi
+
+
+# Check whether --with-initddir was given.
+if test "${with_initddir+set}" = set; then :
+ withval=$with_initddir; initddir_path=$withval
+else
+ case "$host_os" in
+ *linux*)
+ if test -d $sysconfdir/rc.d/init.d ; then
+ initddir_path=$sysconfdir/rc.d/init.d
+ else
+ initddir_path=$sysconfdir/init.d
+ fi
+ ;;
+ *)
+ initddir_path=$sysconfdir/rc.d
+ ;;
+ esac
+fi
+
+
+
+# Check whether --with-sysconfig-leaf-dir was given.
+if test "${with_sysconfig_leaf_dir+set}" = set; then :
+ withval=$with_sysconfig_leaf_dir; config_leaf_dir=$withval
+else
+ config_leaf_dir=sysconfig
+ if test ! -d /etc/sysconfig ; then config_leaf_dir=default ; fi
+fi
+
+CONFIG_LEAF_DIR=$config_leaf_dir
+
+
+
+# Check whether --with-libexec-leaf-dir was given.
+if test "${with_libexec_leaf_dir+set}" = set; then :
+ withval=$with_libexec_leaf_dir; libexec_subdir=$withval
+else
+ libexec_subdir=$PACKAGE_TARNAME
+fi
+
+
+
+# Check whether --with-xen-dumpdir was given.
+if test "${with_xen_dumpdir+set}" = set; then :
+ withval=$with_xen_dumpdir; xen_dumpdir_path=$withval
+else
+ xen_dumpdir_path=$localstatedir/lib/xen/dump
+fi
+
+
+if test "$libexecdir" = '${exec_prefix}/libexec' ; then
+ case "$host_os" in
+ *netbsd*) ;;
+ *)
+ libexecdir='${exec_prefix}/lib'
+ ;;
+ esac
+fi
+LIBEXEC=`eval echo $libexecdir/$libexec_subdir`
+
+
+LIBEXEC_BIN=${LIBEXEC}/bin
+
+LIBEXEC_LIB=${LIBEXEC}/lib
+
+LIBEXEC_INC=${LIBEXEC}/include
+
+XENFIRMWAREDIR=${LIBEXEC}/boot
+
+
+XEN_RUN_DIR=$localstatedir/run/xen
+
+
+XEN_LOG_DIR=$localstatedir/log/xen
+
+
+XEN_LIB_STORED=$localstatedir/lib/xenstored
+
+
+XEN_LIB_DIR=$localstatedir/lib/xen
+
+
+SHAREDIR=$prefix/share
+
+
+CONFIG_DIR=$sysconfdir
+
+
+INITD_DIR=$initddir_path
+
+
+XEN_CONFIG_DIR=$CONFIG_DIR/xen
+
+
+XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
+
+
+case "$host_os" in
+*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
+*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
+*) XEN_LOCK_DIR=$localstatedir/lock ;;
+esac
+
+
+XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
+
+
+XEN_DUMP_DIR=$xen_dumpdir_path
+
+
+
+
+
# Extract the first word of "fig2dev", so it can be a program name with args.
set dummy fig2dev; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -2793,6 +2973,8 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"../config/Docs.mk") CONFIG_FILES="$CONFIG_FILES ../config/Docs.mk" ;;
+ "man/xl.cfg.pod.5") CONFIG_FILES="$CONFIG_FILES man/xl.cfg.pod.5" ;;
+ "man/xl.pod.1") CONFIG_FILES="$CONFIG_FILES man/xl.pod.1" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/docs/configure.ac b/docs/configure.ac
index bc77f49..a2929c4 100644
--- a/docs/configure.ac
+++ b/docs/configure.ac
@@ -5,13 +5,20 @@ AC_PREREQ([2.67])
AC_INIT([Xen Hypervisor Documentation], m4_esyscmd([../version.sh ../xen/Makefile]),
[xen-devel@lists.xen.org], [xen], [http://www.xen.org/])
AC_CONFIG_SRCDIR([misc/xen-command-line.markdown])
-AC_CONFIG_FILES([../config/Docs.mk])
+AC_CONFIG_FILES([
+../config/Docs.mk
+man/xl.cfg.pod.5
+man/xl.pod.1
+])
AC_CONFIG_AUX_DIR([../])
# M4 Macro includes
m4_include([../m4/docs_tool.m4])
m4_include([../m4/path_or_fail.m4])
m4_include([../m4/features.m4])
+m4_include([../m4/paths.m4])
+
+AX_XEN_EXPAND_CONFIG()
AX_DOCS_TOOL_PROG([FIG2DEV], [fig2dev])
AX_DOCS_TOOL_PROG([POD2MAN], [pod2man])
diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5.in
similarity index 99%
rename from docs/man/xl.cfg.pod.5
rename to docs/man/xl.cfg.pod.5.in
index 4a8bf51..3bb27d0 100644
--- a/docs/man/xl.cfg.pod.5
+++ b/docs/man/xl.cfg.pod.5.in
@@ -343,12 +343,12 @@ destroy`.
=item B<coredump-destroy>
-write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
+write a "coredump" of the domain to F<@XEN_DUMP_DIR@/NAME> and then
destroy the domain.
=item B<coredump-restart>
-write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
+write a "coredump" of the domain to F<@XEN_DUMP_DIR@/NAME> and then
restart the domain.
=item B<soft-reset>
@@ -2017,7 +2017,7 @@ natively or via hardware backwards compatibility support.
=head1 FILES
F</etc/xen/NAME.cfg>
-F</var/lib/xen/dump/NAME>
+F<@XEN_DUMP_DIR@/NAME>
=head1 BUGS
diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1.in
similarity index 99%
rename from docs/man/xl.pod.1
rename to docs/man/xl.pod.1.in
index f4dc32c..c1e6b7f 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1.in
@@ -280,7 +280,7 @@ Change the domain name of I<domain-id> to I<new-name>.
Dumps the virtual machine's memory for the specified domain to the
I<filename> specified, without pausing the domain. The dump file will
be written to a distribution specific directory for dump files. Such
-as: /var/lib/xen/dump.
+as: @XEN_DUMP_DIR@/dump.
=item B<help> [I<--long>]
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 09/17] docs: honour XEN_DUMP_DIR
2016-06-13 7:49 ` [PATCH 09/17] docs: honour XEN_DUMP_DIR Wei Liu
@ 2016-06-13 15:15 ` Ian Jackson
0 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2016-06-13 15:15 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel
Wei Liu writes ("[PATCH 09/17] docs: honour XEN_DUMP_DIR"):
> Use configure to generate xl.cfg and xl manpage. Add the generated files
> to gitignore.
...
> Not entirely sure if this is a good idea. I don't deem this patch
> important so I'm fine with dropping it.
It seems like a lot of effort to go to for something which is mostly
cosmetic and will affect a small minority of users (given that we
expect distros not to use weird paths).
But I don't object to it. We should wait a bit and see if anyone else
does.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH 10/17] build: introduce XEN_RUN_STORED
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (8 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 09/17] docs: honour XEN_DUMP_DIR Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-14 17:00 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 11/17] hotplug/Linux: honour XEN_RUN_STORED Wei Liu
` (7 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
It defaults to /var/run/xenstored. It will be used later to remove some
hard-coded paths in tree. There should be no visible change to default
configuration.
Install and remove it in respective Makefile targets.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Need to run autogen.sh.
---
Config.mk | 2 +-
config/Paths.mk.in | 1 +
configure | 4 ++++
docs/configure | 4 ++++
m4/paths.m4 | 3 +++
tools/Makefile | 2 ++
tools/configure | 4 ++++
7 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/Config.mk b/Config.mk
index a4af50b..723e129 100644
--- a/Config.mk
+++ b/Config.mk
@@ -182,7 +182,7 @@ endef
BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \
XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \
XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR XEN_LOG_DIR \
- XEN_LIB_DIR
+ XEN_LIB_DIR XEN_RUN_STORED
buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))
define buildmakevars2file-closure
diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index f185f87..62cea48 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -42,6 +42,7 @@ XEN_RUN_DIR := @XEN_RUN_DIR@
XEN_LOG_DIR := @XEN_LOG_DIR@
XEN_LIB_DIR := @XEN_LIB_DIR@
XEN_LIB_STORED := @XEN_LIB_STORED@
+XEN_RUN_STORED := @XEN_RUN_STORED@
CONFIG_DIR := @CONFIG_DIR@
INITD_DIR := @INITD_DIR@
diff --git a/configure b/configure
index 6782100..8c58494 100755
--- a/configure
+++ b/configure
@@ -604,6 +604,7 @@ INITD_DIR
CONFIG_DIR
SHAREDIR
XEN_LIB_DIR
+XEN_RUN_STORED
XEN_LIB_STORED
XEN_LOG_DIR
XEN_RUN_DIR
@@ -1981,6 +1982,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
XEN_LIB_STORED=$localstatedir/lib/xenstored
+XEN_RUN_STORED=$localstatedir/run/xenstored
+
+
XEN_LIB_DIR=$localstatedir/lib/xen
diff --git a/docs/configure b/docs/configure
index 46f0e68..6481bae 100755
--- a/docs/configure
+++ b/docs/configure
@@ -603,6 +603,7 @@ INITD_DIR
CONFIG_DIR
SHAREDIR
XEN_LIB_DIR
+XEN_RUN_STORED
XEN_LIB_STORED
XEN_LOG_DIR
XEN_RUN_DIR
@@ -1887,6 +1888,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
XEN_LIB_STORED=$localstatedir/lib/xenstored
+XEN_RUN_STORED=$localstatedir/run/xenstored
+
+
XEN_LIB_DIR=$localstatedir/lib/xen
diff --git a/m4/paths.m4 b/m4/paths.m4
index 1c444c4..722a8aa 100644
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -107,6 +107,9 @@ AC_SUBST(XEN_LOG_DIR)
XEN_LIB_STORED=$localstatedir/lib/xenstored
AC_SUBST(XEN_LIB_STORED)
+XEN_RUN_STORED=$localstatedir/run/xenstored
+AC_SUBST(XEN_RUN_STORED)
+
XEN_LIB_DIR=$localstatedir/lib/xen
AC_SUBST(XEN_LIB_DIR)
diff --git a/tools/Makefile b/tools/Makefile
index cc45758..71515b4 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -64,6 +64,7 @@ install: subdirs-install
$(INSTALL_DIR) $(DESTDIR)$(XEN_LOG_DIR)
$(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
$(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_STORED)
.PHONY: uninstall
uninstall: D=$(DESTDIR)
@@ -78,6 +79,7 @@ uninstall:
rm -f $(D)$(SYSCONFIG_DIR)/xencommons
rm -rf $(D)$(XEN_LIB_DIR)
rm -rf $(D)$(XEN_LIB_STORED)
+ rm -rf $(D)$(XEN_RUN_STORED)
rm -rf $(D)$(bindir)/cpuperf-perfcntr $(D)$(bindir)/cpuperf-xen
rm -rf $(D)$(bindir)/xc_shadow
rm -rf $(D)$(bindir)/pygrub
diff --git a/tools/configure b/tools/configure
index 86f1a81..4c92fa2 100755
--- a/tools/configure
+++ b/tools/configure
@@ -723,6 +723,7 @@ INITD_DIR
CONFIG_DIR
SHAREDIR
XEN_LIB_DIR
+XEN_RUN_STORED
XEN_LIB_STORED
XEN_LOG_DIR
XEN_RUN_DIR
@@ -3940,6 +3941,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
XEN_LIB_STORED=$localstatedir/lib/xenstored
+XEN_RUN_STORED=$localstatedir/run/xenstored
+
+
XEN_LIB_DIR=$localstatedir/lib/xen
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 11/17] hotplug/Linux: honour XEN_RUN_STORED
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (9 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 10/17] build: introduce XEN_RUN_STORED Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:19 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 12/17] libxenstore: " Wei Liu
` (6 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/hotplug/Linux/systemd/xenstored.socket.in | 2 +-
tools/hotplug/Linux/systemd/xenstored_ro.socket.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/hotplug/Linux/systemd/xenstored.socket.in b/tools/hotplug/Linux/systemd/xenstored.socket.in
index 2e8ee04..375c4b7 100644
--- a/tools/hotplug/Linux/systemd/xenstored.socket.in
+++ b/tools/hotplug/Linux/systemd/xenstored.socket.in
@@ -5,7 +5,7 @@ After=proc-xen.mount var-lib-xenstored.mount
ConditionPathExists=/proc/xen/capabilities
[Socket]
-ListenStream=/var/run/xenstored/socket
+ListenStream=@XEN_RUN_STORED@/socket
SocketMode=0600
Service=xenstored.service
diff --git a/tools/hotplug/Linux/systemd/xenstored_ro.socket.in b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in
index 140ad94..82fe377 100644
--- a/tools/hotplug/Linux/systemd/xenstored_ro.socket.in
+++ b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in
@@ -5,7 +5,7 @@ After=proc-xen.mount var-lib-xenstored.mount
ConditionPathExists=/proc/xen/capabilities
[Socket]
-ListenStream=/var/run/xenstored/socket_ro
+ListenStream=@XEN_RUN_STORED@/socket_ro
SocketMode=0660
Service=xenstored.service
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 12/17] libxenstore: honour XEN_RUN_STORED
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (10 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 11/17] hotplug/Linux: honour XEN_RUN_STORED Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:19 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 13/17] hotplug/FreeBSD: " Wei Liu
` (5 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/xenstore/Makefile | 1 +
tools/xenstore/xs_lib.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index d691b78..36b6fd4 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -12,6 +12,7 @@ CFLAGS += -I./include
CFLAGS += $(CFLAGS_libxenevtchn)
CFLAGS += $(CFLAGS_libxenctrl)
CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\""
+CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\""
CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS)
LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c
index 0c7744e..6568e82 100644
--- a/tools/xenstore/xs_lib.c
+++ b/tools/xenstore/xs_lib.c
@@ -35,7 +35,7 @@ const char *xs_daemon_rootdir(void)
const char *xs_daemon_rundir(void)
{
char *s = getenv("XENSTORED_RUNDIR");
- return (s ? s : "/var/run/xenstored");
+ return (s ? s : XEN_RUN_STORED);
}
static const char *xs_daemon_path(void)
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 13/17] hotplug/FreeBSD: honour XEN_RUN_STORED
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (11 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 12/17] libxenstore: " Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 9:32 ` Roger Pau Monné
2016-06-13 15:20 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 14/17] ocaml/libxs: generate a paths.ml Wei Liu
` (4 subsequent siblings)
17 siblings, 2 replies; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, Roger Pau Monné
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/xencommons.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index 2f9e1ec..efa8801 100644
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -25,7 +25,7 @@ XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
xen_precmd()
{
- mkdir -p /var/run/xenstored || exit 1
+ mkdir -p @XEN_LIB_STORED@ || exit 1
}
xen_startcmd()
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH 14/17] ocaml/libxs: generate a paths.ml
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (12 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 13/17] hotplug/FreeBSD: " Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-13 15:19 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED Wei Liu
` (3 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, David Scot
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: David Scot <dave@recoil.org>
---
.gitignore | 1 +
tools/ocaml/libs/xs/Makefile | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 8e0a177..5914bbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -348,6 +348,7 @@ tools/ocaml/libs/xl/xenlight.mli
tools/ocaml/libs/xentoollog/_xtl_levels.*
tools/ocaml/libs/xentoollog/xentoollog.ml
tools/ocaml/libs/xentoollog/xentoollog.mli
+tools/ocaml/libs/xs/paths.ml
tools/ocaml/xenstored/oxenstored
tools/ocaml/xenstored/oxenstored.conf
tools/ocaml/xenstored/paths.ml
diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile
index 7a3d886..572efb7 100644
--- a/tools/ocaml/libs/xs/Makefile
+++ b/tools/ocaml/libs/xs/Makefile
@@ -11,7 +11,7 @@ OCAMLOPTFLAGS += -for-pack Xenstore
PREINTF = xsraw.cmi xst.cmi
PREOBJS = queueop xsraw xst
PRELIBS = $(foreach obj, $(PREOBJS),$(obj).cmo) $(foreach obj,$(PREOJBS),$(obj).cmx)
-OBJS = queueop xsraw xst xs
+OBJS = paths queueop xsraw xst xs
INTF = xsraw.cmi xst.cmi xs.cmi
LIBS = xenstore.cma xenstore.cmxa
@@ -45,3 +45,7 @@ uninstall:
include $(TOPLEVEL)/Makefile.rules
+genpath-target = $(call buildmakevars2module,paths.ml)
+$(eval $(genpath-target))
+
+GENERATED_FILES += paths.ml
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 14/17] ocaml/libxs: generate a paths.ml
2016-06-13 7:49 ` [PATCH 14/17] ocaml/libxs: generate a paths.ml Wei Liu
@ 2016-06-13 15:19 ` Ian Jackson
2016-06-13 15:22 ` Wei Liu
0 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2016-06-13 15:19 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, David Scot
Wei Liu writes ("[PATCH 14/17] ocaml/libxs: generate a paths.ml"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
FAOD I don't consider myself qualified to review this.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 14/17] ocaml/libxs: generate a paths.ml
2016-06-13 15:19 ` Ian Jackson
@ 2016-06-13 15:22 ` Wei Liu
2016-06-13 19:50 ` David Scott
0 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 15:22 UTC (permalink / raw)
To: Ian Jackson; +Cc: Xen-devel, Wei Liu, David Scot
On Mon, Jun 13, 2016 at 04:19:59PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH 14/17] ocaml/libxs: generate a paths.ml"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>
> FAOD I don't consider myself qualified to review this.
>
David gave his ack to a similar path so I presume he will be fine with
this, too.
I will wait for his ack anyway.
Wei.
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 14/17] ocaml/libxs: generate a paths.ml
2016-06-13 15:22 ` Wei Liu
@ 2016-06-13 19:50 ` David Scott
2016-06-14 9:36 ` Wei Liu
0 siblings, 1 reply; 48+ messages in thread
From: David Scott @ 2016-06-13 19:50 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Ian Jackson
> On 13 Jun 2016, at 16:22, Wei Liu <wei.liu2@citrix.com> wrote:
>
> On Mon, Jun 13, 2016 at 04:19:59PM +0100, Ian Jackson wrote:
>> Wei Liu writes ("[PATCH 14/17] ocaml/libxs: generate a paths.ml"):
>>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>>
>> FAOD I don't consider myself qualified to review this.
>>
>
> David gave his ack to a similar path so I presume he will be fine with
> this, too.
>
> I will wait for his ack anyway.
Looks fine to me.
Acked-by: David Scott <dave@recoil.org>
Cheers,
Dave
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 14/17] ocaml/libxs: generate a paths.ml
2016-06-13 19:50 ` David Scott
@ 2016-06-14 9:36 ` Wei Liu
2016-06-14 20:08 ` David Scott
0 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-14 9:36 UTC (permalink / raw)
To: David Scott; +Cc: Ian Jackson, Wei Liu, Xen-devel
On Mon, Jun 13, 2016 at 08:50:02PM +0100, David Scott wrote:
>
> > On 13 Jun 2016, at 16:22, Wei Liu <wei.liu2@citrix.com> wrote:
> >
> > On Mon, Jun 13, 2016 at 04:19:59PM +0100, Ian Jackson wrote:
> >> Wei Liu writes ("[PATCH 14/17] ocaml/libxs: generate a paths.ml"):
> >>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> >>
> >> FAOD I don't consider myself qualified to review this.
> >>
> >
> > David gave his ack to a similar path so I presume he will be fine with
> > this, too.
> >
> > I will wait for his ack anyway.
>
> Looks fine to me.
>
> Acked-by: David Scott <dave@recoil.org>
>
Thanks.
FAOD: I think this ack is only for this patch. I will hold off pushing
this one and wait until other ocaml patches are acked.
Wei.
> Cheers,
> Dave
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 14/17] ocaml/libxs: generate a paths.ml
2016-06-14 9:36 ` Wei Liu
@ 2016-06-14 20:08 ` David Scott
2016-06-15 9:07 ` Wei Liu
0 siblings, 1 reply; 48+ messages in thread
From: David Scott @ 2016-06-14 20:08 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Ian Jackson
> On 14 Jun 2016, at 10:36, Wei Liu <wei.liu2@citrix.com> wrote:
>
> On Mon, Jun 13, 2016 at 08:50:02PM +0100, David Scott wrote:
>>
>>> On 13 Jun 2016, at 16:22, Wei Liu <wei.liu2@citrix.com> wrote:
>>>
>>> On Mon, Jun 13, 2016 at 04:19:59PM +0100, Ian Jackson wrote:
>>>> Wei Liu writes ("[PATCH 14/17] ocaml/libxs: generate a paths.ml"):
>>>>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>>>>
>>>> FAOD I don't consider myself qualified to review this.
>>>>
>>>
>>> David gave his ack to a similar path so I presume he will be fine with
>>> this, too.
>>>
>>> I will wait for his ack anyway.
>>
>> Looks fine to me.
>>
>> Acked-by: David Scott <dave@recoil.org>
>>
>
> Thanks.
>
> FAOD: I think this ack is only for this patch. I will hold off pushing
> this one and wait until other ocaml patches are asked.
I think I’ve acked the rest — let me know if I missed one :)
Cheers,
Dave
>
> Wei.
>
>> Cheers,
>> Dave
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 14/17] ocaml/libxs: generate a paths.ml
2016-06-14 20:08 ` David Scott
@ 2016-06-15 9:07 ` Wei Liu
0 siblings, 0 replies; 48+ messages in thread
From: Wei Liu @ 2016-06-15 9:07 UTC (permalink / raw)
To: David Scott; +Cc: Ian Jackson, Wei Liu, Xen-devel
On Tue, Jun 14, 2016 at 09:08:59PM +0100, David Scott wrote:
>
> > On 14 Jun 2016, at 10:36, Wei Liu <wei.liu2@citrix.com> wrote:
> >
> > On Mon, Jun 13, 2016 at 08:50:02PM +0100, David Scott wrote:
> >>
> >>> On 13 Jun 2016, at 16:22, Wei Liu <wei.liu2@citrix.com> wrote:
> >>>
> >>> On Mon, Jun 13, 2016 at 04:19:59PM +0100, Ian Jackson wrote:
> >>>> Wei Liu writes ("[PATCH 14/17] ocaml/libxs: generate a paths.ml"):
> >>>>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> >>>>
> >>>> FAOD I don't consider myself qualified to review this.
> >>>>
> >>>
> >>> David gave his ack to a similar path so I presume he will be fine with
> >>> this, too.
> >>>
> >>> I will wait for his ack anyway.
> >>
> >> Looks fine to me.
> >>
> >> Acked-by: David Scott <dave@recoil.org>
> >>
> >
> > Thanks.
> >
> > FAOD: I think this ack is only for this patch. I will hold off pushing
> > this one and wait until other ocaml patches are asked.
>
> I think I’ve acked the rest — let me know if I missed one :)
>
Thanks. I think that's all I need for this series.
Wei.
> Cheers,
> Dave
>
> >
> > Wei.
> >
> >> Cheers,
> >> Dave
> >
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (13 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 14/17] ocaml/libxs: generate a paths.ml Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-14 20:06 ` David Scott
2016-06-13 7:49 ` [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR Wei Liu
` (2 subsequent siblings)
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, David Scot
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: David Scot <dave@recoil.org>
---
tools/ocaml/libs/xs/xs.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/ocaml/libs/xs/xs.ml b/tools/ocaml/libs/xs/xs.ml
index 7e14487..db9959a 100644
--- a/tools/ocaml/libs/xs/xs.ml
+++ b/tools/ocaml/libs/xs/xs.ml
@@ -147,7 +147,7 @@ let monitor_paths xsh l time callback =
end;
unwatch ()
-let daemon_socket = "/var/run/xenstored/socket"
+let daemon_socket = Paths.xen_run_stored ^ "/socket"
(** Throws this rather than a miscellaneous Unix.connect failed *)
exception Failed_to_connect
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED
2016-06-13 7:49 ` [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED Wei Liu
@ 2016-06-14 20:06 ` David Scott
0 siblings, 0 replies; 48+ messages in thread
From: David Scott @ 2016-06-14 20:06 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Ian Jackson
> On 13 Jun 2016, at 08:49, Wei Liu <wei.liu2@citrix.com> wrote:
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: David Scot <dave@recoil.org>
> ---
> tools/ocaml/libs/xs/xs.ml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/ocaml/libs/xs/xs.ml b/tools/ocaml/libs/xs/xs.ml
> index 7e14487..db9959a 100644
> --- a/tools/ocaml/libs/xs/xs.ml
> +++ b/tools/ocaml/libs/xs/xs.ml
> @@ -147,7 +147,7 @@ let monitor_paths xsh l time callback =
> end;
> unwatch ()
>
> -let daemon_socket = "/var/run/xenstored/socket"
> +let daemon_socket = Paths.xen_run_stored ^ "/socket"
>
> (** Throws this rather than a miscellaneous Unix.connect failed *)
> exception Failed_to_connect
> --
> 2.1.4
>
This 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] 48+ messages in thread
* [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (14 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-14 20:07 ` David Scott
2016-06-13 7:49 ` [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub Wei Liu
2016-06-14 13:17 ` [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, David Scott
Only contain changes to ocaml source code. C stub files will be handled
separately.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: David Scott <dave@recoil.org>
---
tools/ocaml/xenstored/define.ml | 6 +++---
tools/ocaml/xenstored/disk.ml | 2 +-
tools/ocaml/xenstored/xenstored.ml | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/ocaml/xenstored/define.ml b/tools/ocaml/xenstored/define.ml
index d60861c..e9d957f 100644
--- a/tools/ocaml/xenstored/define.ml
+++ b/tools/ocaml/xenstored/define.ml
@@ -20,10 +20,10 @@ let xenstored_minor = 0
let xenstored_proc_kva = "/proc/xen/xsd_kva"
let xenstored_proc_port = "/proc/xen/xsd_port"
-let xs_daemon_socket = "/var/run/xenstored/socket"
-let xs_daemon_socket_ro = "/var/run/xenstored/socket_ro"
+let xs_daemon_socket = Paths.xen_run_stored ^ "/socket"
+let xs_daemon_socket_ro = Paths.xen_run_stored ^ "/socket_ro"
-let default_config_dir = "/etc/xen"
+let default_config_dir = Paths.xen_config_dir
let maxwatch = ref (50)
let maxtransaction = ref (20)
diff --git a/tools/ocaml/xenstored/disk.ml b/tools/ocaml/xenstored/disk.ml
index 4ae1fce..4739967 100644
--- a/tools/ocaml/xenstored/disk.ml
+++ b/tools/ocaml/xenstored/disk.ml
@@ -15,7 +15,7 @@
*)
let enable = ref false
-let xs_daemon_database = "/var/run/xenstored/db"
+let xs_daemon_database = Paths.xen_run_stored ^ "/db"
let error fmt = Logging.error "disk" fmt
diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml
index fc8cc95..30570ed 100644
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -66,7 +66,7 @@ let process_domains store cons domains =
let sigusr1_handler store =
try
let channel = open_out_gen [ Open_wronly; Open_creat; Open_trunc; ]
- 0o600 "/var/run/xenstored/db.debug" in
+ 0o600 (Paths.xen_run_stored ^ "/db.debug") in
finally (fun () -> Store.dump store channel)
(fun () -> close_out channel)
with _ ->
@@ -266,7 +266,7 @@ let _ =
let quit = ref false in
if cf.restart then (
- DB.from_file store domains cons "/var/run/xenstored/db";
+ DB.from_file store domains cons (Paths.xen_run_stored ^ "/db");
Event.bind_dom_exc_virq eventchn
) else (
if !Disk.enable then (
@@ -293,7 +293,7 @@ let _ =
Logging.init_xenstored_log();
if cf.activate_access_log then begin
- let post_rotate () = DB.to_file store cons "/var/run/xenstored/db" in
+ let post_rotate () = DB.to_file store cons (Paths.xen_run_stored ^ "/db") in
Logging.init_access_log post_rotate
end;
@@ -440,5 +440,5 @@ let _ =
raise exc
done;
info "stopping xenstored";
- DB.to_file store cons "/var/run/xenstored/db";
+ DB.to_file store cons (Paths.xen_run_stored ^ "/db");
()
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR
2016-06-13 7:49 ` [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR Wei Liu
@ 2016-06-14 20:07 ` David Scott
0 siblings, 0 replies; 48+ messages in thread
From: David Scott @ 2016-06-14 20:07 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Ian Jackson
> On 13 Jun 2016, at 08:49, Wei Liu <wei.liu2@citrix.com> wrote:
>
> Only contain changes to ocaml source code. C stub files will be handled
> separately.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: David Scott <dave@recoil.org>
> ---
> tools/ocaml/xenstored/define.ml | 6 +++---
> tools/ocaml/xenstored/disk.ml | 2 +-
> tools/ocaml/xenstored/xenstored.ml | 8 ++++----
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tools/ocaml/xenstored/define.ml b/tools/ocaml/xenstored/define.ml
> index d60861c..e9d957f 100644
> --- a/tools/ocaml/xenstored/define.ml
> +++ b/tools/ocaml/xenstored/define.ml
> @@ -20,10 +20,10 @@ let xenstored_minor = 0
> let xenstored_proc_kva = "/proc/xen/xsd_kva"
> let xenstored_proc_port = "/proc/xen/xsd_port"
>
> -let xs_daemon_socket = "/var/run/xenstored/socket"
> -let xs_daemon_socket_ro = "/var/run/xenstored/socket_ro"
> +let xs_daemon_socket = Paths.xen_run_stored ^ "/socket"
> +let xs_daemon_socket_ro = Paths.xen_run_stored ^ "/socket_ro"
>
> -let default_config_dir = "/etc/xen"
> +let default_config_dir = Paths.xen_config_dir
>
> let maxwatch = ref (50)
> let maxtransaction = ref (20)
> diff --git a/tools/ocaml/xenstored/disk.ml b/tools/ocaml/xenstored/disk.ml
> index 4ae1fce..4739967 100644
> --- a/tools/ocaml/xenstored/disk.ml
> +++ b/tools/ocaml/xenstored/disk.ml
> @@ -15,7 +15,7 @@
> *)
>
> let enable = ref false
> -let xs_daemon_database = "/var/run/xenstored/db"
> +let xs_daemon_database = Paths.xen_run_stored ^ "/db"
>
> let error fmt = Logging.error "disk" fmt
>
> diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml
> index fc8cc95..30570ed 100644
> --- a/tools/ocaml/xenstored/xenstored.ml
> +++ b/tools/ocaml/xenstored/xenstored.ml
> @@ -66,7 +66,7 @@ let process_domains store cons domains =
> let sigusr1_handler store =
> try
> let channel = open_out_gen [ Open_wronly; Open_creat; Open_trunc; ]
> - 0o600 "/var/run/xenstored/db.debug" in
> + 0o600 (Paths.xen_run_stored ^ "/db.debug") in
> finally (fun () -> Store.dump store channel)
> (fun () -> close_out channel)
> with _ ->
> @@ -266,7 +266,7 @@ let _ =
> let quit = ref false in
>
> if cf.restart then (
> - DB.from_file store domains cons "/var/run/xenstored/db";
> + DB.from_file store domains cons (Paths.xen_run_stored ^ "/db");
> Event.bind_dom_exc_virq eventchn
> ) else (
> if !Disk.enable then (
> @@ -293,7 +293,7 @@ let _ =
>
> Logging.init_xenstored_log();
> if cf.activate_access_log then begin
> - let post_rotate () = DB.to_file store cons "/var/run/xenstored/db" in
> + let post_rotate () = DB.to_file store cons (Paths.xen_run_stored ^ "/db") in
> Logging.init_access_log post_rotate
> end;
>
> @@ -440,5 +440,5 @@ let _ =
> raise exc
> done;
> info "stopping xenstored";
> - DB.to_file store cons "/var/run/xenstored/db";
> + DB.to_file store cons (Paths.xen_run_stored ^ "/db");
> ()
> --
> 2.1.4
>
This also 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] 48+ messages in thread
* [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (15 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR Wei Liu
@ 2016-06-13 7:49 ` Wei Liu
2016-06-14 20:07 ` David Scott
2016-06-14 13:17 ` [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-13 7:49 UTC (permalink / raw)
To: Xen-devel; +Cc: Ian Jackson, Wei Liu, David Scott
Generate a _paths.h for that and add proper dependency.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: David Scott <dave@recoil.org>
---
.gitignore | 1 +
tools/ocaml/xenstored/Makefile | 7 +++++++
tools/ocaml/xenstored/systemd_stubs.c | 6 ++++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5914bbe..e019f2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -349,6 +349,7 @@ tools/ocaml/libs/xentoollog/_xtl_levels.*
tools/ocaml/libs/xentoollog/xentoollog.ml
tools/ocaml/libs/xentoollog/xentoollog.mli
tools/ocaml/libs/xs/paths.ml
+tools/ocaml/xenstored/_paths.h
tools/ocaml/xenstored/oxenstored
tools/ocaml/xenstored/oxenstored.conf
tools/ocaml/xenstored/paths.ml
diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
index 939dcaa..1769e55 100644
--- a/tools/ocaml/xenstored/Makefile
+++ b/tools/ocaml/xenstored/Makefile
@@ -30,6 +30,8 @@ systemd_OBJS = systemd
systemd_C_OBJS = systemd_stubs
OCAML_LIBRARY += systemd
+$(foreach obj,$(systemd_C_OBJS),$(obj).o): _paths.h
+
LIBS_systemd += $(LDFLAGS-y)
OBJS = paths \
@@ -93,3 +95,8 @@ genpath-target = $(call buildmakevars2module,paths.ml)
$(eval $(genpath-target))
GENERATED_FILES += paths.ml
+
+genpath-target = $(call buildmakevars2header,_paths.h)
+$(eval $(genpath-target))
+
+GENERATE_FILES += _paths.h
diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c
index a78a72b..322f1e0 100644
--- a/tools/ocaml/xenstored/systemd_stubs.c
+++ b/tools/ocaml/xenstored/systemd_stubs.c
@@ -28,6 +28,8 @@
#include <sys/socket.h>
#include <systemd/sd-daemon.h>
+#include "_paths.h"
+
/* Will work regardless of the order systemd gives them to us */
static int oxen_get_sd_fd(const char *connect_to)
{
@@ -46,8 +48,8 @@ static int oxen_get_sd_fd(const char *connect_to)
static int oxen_verify_socket_socket(const char *connect_to)
{
- if ((strcmp("/var/run/xenstored/socket_ro", connect_to) != 0) &&
- (strcmp("/var/run/xenstored/socket", connect_to) != 0)) {
+ if ((strcmp(XEN_RUN_STORED "/socket_ro", connect_to) != 0) &&
+ (strcmp(XEN_RUN_STORED "/socket", connect_to) != 0)) {
sd_notifyf(0, "STATUS=unexpected socket: %s\n"
"ERRNO=%i",
connect_to,
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub
2016-06-13 7:49 ` [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub Wei Liu
@ 2016-06-14 20:07 ` David Scott
0 siblings, 0 replies; 48+ messages in thread
From: David Scott @ 2016-06-14 20:07 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Ian Jackson
> On 13 Jun 2016, at 08:49, Wei Liu <wei.liu2@citrix.com> wrote:
>
> Generate a _paths.h for that and add proper dependency.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: David Scott <dave@recoil.org>
> ---
> .gitignore | 1 +
> tools/ocaml/xenstored/Makefile | 7 +++++++
> tools/ocaml/xenstored/systemd_stubs.c | 6 ++++--
> 3 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index 5914bbe..e019f2e 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -349,6 +349,7 @@ tools/ocaml/libs/xentoollog/_xtl_levels.*
> tools/ocaml/libs/xentoollog/xentoollog.ml
> tools/ocaml/libs/xentoollog/xentoollog.mli
> tools/ocaml/libs/xs/paths.ml
> +tools/ocaml/xenstored/_paths.h
> tools/ocaml/xenstored/oxenstored
> tools/ocaml/xenstored/oxenstored.conf
> tools/ocaml/xenstored/paths.ml
> diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
> index 939dcaa..1769e55 100644
> --- a/tools/ocaml/xenstored/Makefile
> +++ b/tools/ocaml/xenstored/Makefile
> @@ -30,6 +30,8 @@ systemd_OBJS = systemd
> systemd_C_OBJS = systemd_stubs
> OCAML_LIBRARY += systemd
>
> +$(foreach obj,$(systemd_C_OBJS),$(obj).o): _paths.h
> +
> LIBS_systemd += $(LDFLAGS-y)
>
> OBJS = paths \
> @@ -93,3 +95,8 @@ genpath-target = $(call buildmakevars2module,paths.ml)
> $(eval $(genpath-target))
>
> GENERATED_FILES += paths.ml
> +
> +genpath-target = $(call buildmakevars2header,_paths.h)
> +$(eval $(genpath-target))
> +
> +GENERATE_FILES += _paths.h
> diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c
> index a78a72b..322f1e0 100644
> --- a/tools/ocaml/xenstored/systemd_stubs.c
> +++ b/tools/ocaml/xenstored/systemd_stubs.c
> @@ -28,6 +28,8 @@
> #include <sys/socket.h>
> #include <systemd/sd-daemon.h>
>
> +#include "_paths.h"
> +
> /* Will work regardless of the order systemd gives them to us */
> static int oxen_get_sd_fd(const char *connect_to)
> {
> @@ -46,8 +48,8 @@ static int oxen_get_sd_fd(const char *connect_to)
>
> static int oxen_verify_socket_socket(const char *connect_to)
> {
> - if ((strcmp("/var/run/xenstored/socket_ro", connect_to) != 0) &&
> - (strcmp("/var/run/xenstored/socket", connect_to) != 0)) {
> + if ((strcmp(XEN_RUN_STORED "/socket_ro", connect_to) != 0) &&
> + (strcmp(XEN_RUN_STORED "/socket", connect_to) != 0)) {
> sd_notifyf(0, "STATUS=unexpected socket: %s\n"
> "ERRNO=%i",
> connect_to,
> --
> 2.1.4
>
This also 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] 48+ messages in thread
* Re: [PATCH 00/17] Honour more configure variables in various places (iteration 2)
2016-06-13 7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
` (16 preceding siblings ...)
2016-06-13 7:49 ` [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub Wei Liu
@ 2016-06-14 13:17 ` Wei Liu
2016-06-17 10:43 ` Wei Liu
17 siblings, 1 reply; 48+ messages in thread
From: Wei Liu @ 2016-06-14 13:17 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu
On Mon, Jun 13, 2016 at 08:48:58AM +0100, Wei Liu wrote:
> The first three patches are carried over from previous series.
>
> The rest introduce some new variables and replace various hard-coded paths in
> code.
>
> There is one more path /var/run, with which I'm not sure what to do for the
> moment. More patches will come to deal with it.
>
> Wei.
>
> Wei Liu (17):
> oxenstored: honour XEN_{LOG,RUN}_DIR in oxenstored.conf
> oxenstored: generate a paths module
> oxenstored: honour XEN_LOG_DIR defined by configure
> build: introduce and export XEN_LIB_DIR
> tools: install and remove XEN_LIB_DIR in Makefile
> hotplug/Linux: honour XEN_LIB_DIR
> libxl: honour XEN_LIB_DIR
> tools: remove hard-coded /var/lib/xen in Makefile
I've queued up these seven.
> docs: honour XEN_DUMP_DIR
This is acked but we would like to wait a bit.
> build: introduce XEN_RUN_STORED
This is not yet acked.
> hotplug/Linux: honour XEN_RUN_STORED
> libxenstore: honour XEN_RUN_STORED
> hotplug/FreeBSD: honour XEN_RUN_STORED
These are acked but depend on the introduction of XEN_RUN_STORED.
> ocaml/libxs: generate a paths.ml
> ocaml/libxs: honour XEN_RUN_STORED
> oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR
> oxenstored: honour XEN_RUN_STORED in systemd C stub
The last three are not yet acked. Will wait for David to express his
opinion.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 00/17] Honour more configure variables in various places (iteration 2)
2016-06-14 13:17 ` [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
@ 2016-06-17 10:43 ` Wei Liu
0 siblings, 0 replies; 48+ messages in thread
From: Wei Liu @ 2016-06-17 10:43 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu
On Tue, Jun 14, 2016 at 02:17:38PM +0100, Wei Liu wrote:
>
> > docs: honour XEN_DUMP_DIR
>
> This is acked but we would like to wait a bit.
>
> > build: introduce XEN_RUN_STORED
>
> This is not yet acked.
>
> > hotplug/Linux: honour XEN_RUN_STORED
> > libxenstore: honour XEN_RUN_STORED
> > hotplug/FreeBSD: honour XEN_RUN_STORED
>
> These are acked but depend on the introduction of XEN_RUN_STORED.
>
> > ocaml/libxs: generate a paths.ml
> > ocaml/libxs: honour XEN_RUN_STORED
> > oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR
> > oxenstored: honour XEN_RUN_STORED in systemd C stub
>
I've pushed the remaining patches to staging.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 48+ messages in thread