]> xenbits.xensource.com Git - xen.git/commitdiff
oxenstored: allow compilation prior to OCaml 3.12.0
authorJonathan Davies <jonathan.davies@citrix.com>
Thu, 23 Mar 2017 17:54:35 +0000 (17:54 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 5 Apr 2017 14:26:38 +0000 (15:26 +0100)
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.

Reported-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Jonathan Davies <jonathan.davies@citrix.com>
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
tools/ocaml/xenstored/process.ml

index 10b73574b502b9b1459c2fc6b63cbc71656dec47..9cf2b46610b1f28a575fe2ac91120f43714f991f 100644 (file)
@@ -472,7 +472,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\""