From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Jonathan Davies <jonathan.davies@citrix.com>
Cc: xen-devel@lists.xenproject.org,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Dave Scott <dave@recoil.org>, Wei Liu <wei.liu2@citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH v2] oxenstored: allow compilation prior to OCaml 3.12.0
Date: Wed, 30 Mar 2016 12:16:03 -0400 [thread overview]
Message-ID: <20160330161603.GE8720@char.us.oracle.com> (raw)
In-Reply-To: <1459353999-8218-1-git-send-email-jonathan.davies@citrix.com>
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
prev parent reply other threads:[~2016-03-30 16:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160330161603.GE8720@char.us.oracle.com \
--to=konrad.wilk@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=dave@recoil.org \
--cc=jonathan.davies@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).