[Xen-changelog] [xen stable-4.6] oxenstored: allow compilation prior to OCaml 3.12.0

[patchbot@xxxxxxx]

commit bf22c39e4bf16ea3f3b0ad8af6374eaaf7e4c7bc
Author:     Jonathan Davies <jonathan.davies@xxxxxxxxxx>
AuthorDate: Thu Mar 23 16:28:45 2017 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Wed Apr 5 15:19:02 2017 +0100

    oxenstored: allow compilation prior to OCaml 3.12.0
    
    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@xxxxxxxx>
    Signed-off-by: Jonathan Davies <jonathan.davies@xxxxxxxxxx>
    Reported-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
    Tested-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
---
 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\""
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog