From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 1 Sep 2015 18:34:02 +0000 (-0500)
Subject: ocaml/xs: prefer using character device
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2596
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7d418eab3b6dbdeec84bf73af301dca54368547a;p=xen.git

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 5757571072..7e14487939 100644
--- 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