From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH] ocaml/xs: prefer using character device
Date: Wed, 2 Sep 2015 12:21:27 +0100
Message-ID: <1441192887.26292.138.camel@citrix.com>
References: <1441132442-30166-1-git-send-email-cardoe@cardoe.com>
	<AA65E462-D242-45AE-97BE-015B8157BA97@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <AA65E462-D242-45AE-97BE-015B8157BA97@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Dave Scott <Dave.Scott@citrix.com>, Doug Goldstein <cardoe@cardoe.com>
Cc: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org>
List-Id: xen-devel@lists.xenproject.org

On Wed, 2015-09-02 at 09:50 +0000, Dave Scott wrote:
> Looks fine to me.
> 
> Acked-by: David Scott <dave.scott@citrix.com>

Applied.

> 
> > On 1 Sep 2015, at 19:34, Doug Goldstein <cardoe@cardoe.com> 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@cardoe.com>
> > ---
> > 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