Re: [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0

[Jonathan Davies <Jonathan.Davies@citrix.com>]

On 30/03/2016 4:54 PM, Boris Ostrovsky wrote:
> On 03/30/2016 11:47 AM, Jonathan Davies wrote:
> > Commit 363ae55c8 used an OCaml feature called record field punning.
> > This broke the build on compilers prior to OCaml 3.12.0.
> >
> > This patch makes no semantic change but now uses backwards-compatible
> syntax.
> >
> > Signed-off-by: Jonathan Davies <jonathan.davies@citrix.com>
> > Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> 
> This should be Tested-by (and maybe Reported-by). Reviewed-by implies
> that I understood what you did. I make no such claim ;-)
> 
> -boris

My apologies!

Corrected version coming up.

Jonathan

> > ---
> >   tools/ocaml/xenstored/process.ml |    2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/ocaml/xenstored/process.ml
> > b/tools/ocaml/xenstored/process.ml
> > index fb5fdaf..7b60376 100644
> > --- a/tools/ocaml/xenstored/process.ml
> > +++ b/tools/ocaml/xenstored/process.ml
> > @@ -484,7 +484,7 @@ let do_input store cons doms con =
> >   	if newpacket then (
> >   		let packet = Connection.pop_in con in
> >   		let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in
> > -		let req = {Packet.tid; Packet.rid; Packet.ty; Packet.data} in
> > +		let req = {Packet.tid=tid; Packet.rid=rid; Packet.ty=ty;
> > +Packet.data=data} in
> >
> >   		(* As we don't log IO, do not call an unnecessary
> sanitize_data
> >   		   info "[%s] -> [%d] %s \"%s\""
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel