From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: "Wei Liu" <wei.liu2@citrix.com>,
jonathan.ludlam@citrix.com,
"Ian Jackson" <ian.jackson@eu.citrix.com>,
christian.lindig@citrix.com, dave@recoil.org,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH for-4.9 2/2] oxenstored: make it work on FreeBSD
Date: Fri, 14 Apr 2017 11:20:18 +0100 [thread overview]
Message-ID: <20170414102018.14853-3-wei.liu2@citrix.com> (raw)
In-Reply-To: <20170414102018.14853-1-wei.liu2@citrix.com>
Call the uname syscall to determine sysname and return device names
accordingly.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: dave@recoil.org
Cc: christian.lindig@citrix.com
Cc: jonathan.ludlam@citrix.com
Cc: Roger Pau Monné <roger.pau@citrix.com>
---
tools/ocaml/xenstored/define.ml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/tools/ocaml/xenstored/define.ml b/tools/ocaml/xenstored/define.ml
index 5a604d1bea..15b03e539f 100644
--- a/tools/ocaml/xenstored/define.ml
+++ b/tools/ocaml/xenstored/define.ml
@@ -14,11 +14,23 @@
* GNU Lesser General Public License for more details.
*)
+open Unix_syscalls
+
let xenstored_major = 1
let xenstored_minor = 0
-let xenstored_proc_kva = "/proc/xen/xsd_kva"
-let xenstored_proc_port = "/proc/xen/xsd_port"
+let xenstored_proc_kva =
+ let info = Unix_syscalls.uname () in
+ match info.sysname with
+ | "Linux" -> "/proc/xen/xsd_kva"
+ | "FreeBSD" -> "/dev/xen/xenstored"
+ | _ -> "nonexistent"
+let xenstored_proc_port =
+ let info = Unix_syscalls.uname () in
+ match info.sysname with
+ | "Linux" -> "/proc/xen/xsd_port"
+ | "FreeBSD" -> "/dev/xen/xenstored"
+ | _ -> "nonexistent"
let xs_daemon_socket = Paths.xen_run_stored ^ "/socket"
let xs_daemon_socket_ro = Paths.xen_run_stored ^ "/socket_ro"
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-04-14 10:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-14 10:20 [PATCH for-4.9 0/2] oxenstored: make it work on FreeBSD Wei Liu
2017-04-14 10:20 ` [PATCH for-4.9 1/2] oxenstored: add an Unix syscall C extension Wei Liu
2017-04-18 10:14 ` Ian Jackson
2017-04-14 10:20 ` Wei Liu [this message]
2017-04-14 10:32 ` [PATCH for-4.9] oxenstored: remove "_proc" in names Wei Liu
2017-04-18 10:15 ` Ian Jackson
2017-04-18 10:16 ` [PATCH for-4.9 2/2] oxenstored: make it work on FreeBSD Ian Jackson
2017-04-18 10:22 ` Christian Lindig
2017-04-18 9:46 ` [PATCH for-4.9 0/2] " Christian Lindig
2017-04-18 9:59 ` Wei Liu
2017-04-18 10:11 ` Christian Lindig
2017-04-18 10:11 ` Christian Lindig
2017-04-18 13:07 ` 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=20170414102018.14853-3-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=christian.lindig@citrix.com \
--cc=dave@recoil.org \
--cc=ian.jackson@eu.citrix.com \
--cc=jonathan.ludlam@citrix.com \
--cc=roger.pau@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).