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 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub
Date: Mon, 13 Jun 2016 08:49:15 +0100 [thread overview]
Message-ID: <1465804155-14469-18-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com>
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
next prev parent reply other threads:[~2016-06-13 8:22 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 ` [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR Wei Liu
2016-06-14 20:07 ` David Scott
2016-06-13 7:49 ` Wei Liu [this message]
2016-06-14 20:07 ` [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub 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-18-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).