ocaml/xs: prefer using character device

Since 9c89dc95201ffed5fead17b35754bf9440fdbdc0 libxenstore prefers using
/dev/xen/xenbus over /proc/xen/xenbus. This makes the OCaml xenstore
library contain the same preference.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: David Scott <dave.scott@citrix.com>

diff --git a/tools/ocaml/libs/xs/xs.ml b/tools/ocaml/libs/xs/xs.ml
index 57575710729bc036a4dd951a2227374595296024..7e14487939aabcb97c5d80cf7236c97a40b98c19 100644 (file)
--- a/tools/ocaml/libs/xs/xs.ml
+++ b/tools/ocaml/libs/xs/xs.ml
@@ -162,7 +162,13 @@ let daemon_open () =
        with _ -> raise Failed_to_connect
 
 let domain_open () =
-       let path = "/proc/xen/xenbus" in
+       let path = try
+               let devpath = "/dev/xen/xenbus" in
+               Unix.access devpath [ Unix.F_OK ];
+               devpath
+       with Unix.Unix_error(_, _, _) ->
+               "/proc/xen/xenbus" in
+
        let fd = Unix.openfile path [ Unix.O_RDWR ] 0o550 in
        Unix.set_close_on_exec fd;
        make fd