* [PATCH v2] oxenstored: allow compilation prior to OCaml 3.12.0
@ 2016-03-30 16:06 Jonathan Davies
2016-03-30 16:16 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 2+ messages in thread
From: Jonathan Davies @ 2016-03-30 16:06 UTC (permalink / raw)
To: xen-devel
Cc: Jonathan Davies, Boris Ostrovsky, Andrew Cooper, Wei Liu, Dave Scott
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>
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
Changed since v1:
* names listed in the preamble
---
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\""
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] oxenstored: allow compilation prior to OCaml 3.12.0
2016-03-30 16:06 [PATCH v2] oxenstored: allow compilation prior to OCaml 3.12.0 Jonathan Davies
@ 2016-03-30 16:16 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 2+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-03-30 16:16 UTC (permalink / raw)
To: Jonathan Davies
Cc: xen-devel, Boris Ostrovsky, Dave Scott, Wei Liu, Andrew Cooper
On Wed, Mar 30, 2016 at 04:06:39PM +0000, 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>
> Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Applied.
>
> ---
> Changed since v1:
> * names listed in the preamble
> ---
> 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\""
> --
> 1.7.10.4
>
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-30 16:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-30 16:06 [PATCH v2] oxenstored: allow compilation prior to OCaml 3.12.0 Jonathan Davies
2016-03-30 16:16 ` Konrad Rzeszutek Wilk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).