From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
Wei Liu <wei.liu2@citrix.com>, David Scott <dave@recoil.org>
Subject: [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR
Date: Mon, 13 Jun 2016 08:49:14 +0100 [thread overview]
Message-ID: <1465804155-14469-17-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com>
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
next prev parent reply other threads:[~2016-06-13 8:26 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` [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
2016-06-13 7:49 ` [PATCH 04/17] build: introduce and export XEN_LIB_DIR 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
2016-06-13 15:11 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 06/17] hotplug/Linux: honour XEN_LIB_DIR Wei Liu
2016-06-13 15:12 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 07/17] libxl: " 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
2016-06-13 15:13 ` Ian Jackson
2016-06-13 15:29 ` Wei Liu
2016-06-13 16:07 ` Ian Jackson
2016-06-13 16:33 ` Wei Liu
2016-06-13 16:57 ` Ian Jackson
2016-06-13 18:16 ` Wei Liu
2016-06-14 9:56 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 09/17] docs: honour XEN_DUMP_DIR Wei Liu
2016-06-13 15:15 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 10/17] build: introduce XEN_RUN_STORED 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
2016-06-13 15:19 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 12/17] libxenstore: " Wei Liu
2016-06-13 15:19 ` Ian Jackson
2016-06-13 7:49 ` [PATCH 13/17] hotplug/FreeBSD: " 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
2016-06-13 15:19 ` Ian Jackson
2016-06-13 15:22 ` Wei Liu
2016-06-13 19:50 ` David Scott
2016-06-14 9:36 ` Wei Liu
2016-06-14 20:08 ` David Scott
2016-06-15 9:07 ` Wei Liu
2016-06-13 7:49 ` [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED Wei Liu
2016-06-14 20:06 ` David Scott
2016-06-13 7:49 ` Wei Liu [this message]
2016-06-14 20:07 ` [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR David Scott
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
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465804155-14469-17-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=dave@recoil.org \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).