* [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0
@ 2016-03-30 15:47 Jonathan Davies
2016-03-30 15:53 ` Boris Ostrovsky
2016-03-30 15:54 ` Wei Liu
0 siblings, 2 replies; 4+ messages in thread
From: Jonathan Davies @ 2016-03-30 15:47 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>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
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] 4+ messages in thread* Re: [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0
2016-03-30 15:47 [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0 Jonathan Davies
@ 2016-03-30 15:53 ` Boris Ostrovsky
2016-03-30 16:06 ` Jonathan Davies
2016-03-30 15:54 ` Wei Liu
1 sibling, 1 reply; 4+ messages in thread
From: Boris Ostrovsky @ 2016-03-30 15:53 UTC (permalink / raw)
To: Jonathan Davies, xen-devel; +Cc: Andrew Cooper, Wei Liu, Dave Scott
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
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0
2016-03-30 15:53 ` Boris Ostrovsky
@ 2016-03-30 16:06 ` Jonathan Davies
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Davies @ 2016-03-30 16:06 UTC (permalink / raw)
To: 'Boris Ostrovsky', xen-devel@lists.xenproject.org
Cc: Andrew Cooper, Wei Liu, Dave Scott
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0
2016-03-30 15:47 [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0 Jonathan Davies
2016-03-30 15:53 ` Boris Ostrovsky
@ 2016-03-30 15:54 ` Wei Liu
1 sibling, 0 replies; 4+ messages in thread
From: Wei Liu @ 2016-03-30 15:54 UTC (permalink / raw)
To: Jonathan Davies
Cc: xen-devel, Boris Ostrovsky, Andrew Cooper, Wei Liu, Dave Scott
On Wed, Mar 30, 2016 at 03:47:34PM +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>
> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
This should be
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Other than that I don't really have comment on this patch. :-)
> ---
> 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 [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-30 16:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-30 15:47 [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0 Jonathan Davies
2016-03-30 15:53 ` Boris Ostrovsky
2016-03-30 16:06 ` Jonathan Davies
2016-03-30 15:54 ` Wei Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.