Re: [Xen-devel] [PATCH] ocaml/xs: prefer using character device

[Dave Scott <Dave.Scott@xxxxxxxxxx>]

Looks fine to me.

Acked-by: David Scott <dave.scott@xxxxxxxxxx>

> On 1 Sep 2015, at 19:34, Doug Goldstein <cardoe@xxxxxxxxxx> wrote:
> 
> 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@xxxxxxxxxx>
> ---
> tools/ocaml/libs/xs/xs.ml | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/ocaml/libs/xs/xs.ml b/tools/ocaml/libs/xs/xs.ml
> index 5757571..7e14487 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
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel