From patchwork Wed Mar 30 15:47:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Davies X-Patchwork-Id: 8699071 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BA4019F3D1 for ; Wed, 30 Mar 2016 15:50:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE73A20379 for ; Wed, 30 Mar 2016 15:50:31 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 00FB620376 for ; Wed, 30 Mar 2016 15:50:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alILc-0005O6-IS; Wed, 30 Mar 2016 15:47:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alILb-0005No-3g for xen-devel@lists.xenproject.org; Wed, 30 Mar 2016 15:47:55 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id C5/2B-02994-A25FBF65; Wed, 30 Mar 2016 15:47:54 +0000 X-Env-Sender: prvs=8900b691e=Jonathan.Davies@citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1459352872!5898213!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53887 invoked from network); 30 Mar 2016 15:47:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 30 Mar 2016 15:47:53 -0000 X-IronPort-AV: E=Sophos;i="5.24,416,1454976000"; d="scan'208";a="343460501" From: Jonathan Davies To: Date: Wed, 30 Mar 2016 15:47:34 +0000 Message-ID: <1459352854-7507-1-git-send-email-jonathan.davies@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Jonathan Davies , Boris Ostrovsky , Andrew Cooper , Wei Liu , Dave Scott Subject: [Xen-devel] [PATCH] oxenstored: allow compilation prior to OCaml 3.12.0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Boris Ostrovsky --- 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\""