From patchwork Tue Sep 10 12:02:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11139329 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 83391112B for ; Tue, 10 Sep 2019 12:05:59 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F1E32089F for ; Tue, 10 Sep 2019 12:05:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Wqv93lza" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F1E32089F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i7esi-0007WZ-7l; Tue, 10 Sep 2019 12:04:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i7esh-0007WA-62 for xen-devel@lists.xenproject.org; Tue, 10 Sep 2019 12:04:23 +0000 X-Inumbo-ID: 1fb6163d-d3c3-11e9-ac1c-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1fb6163d-d3c3-11e9-ac1c-12813bfff9fa; Tue, 10 Sep 2019 12:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568117062; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=dcgFpQQZzlVp1i9Js2oXBFHAKxoLk1E6Q+Rz+K4CjKs=; b=Wqv93lzam67MWRh/c58xKEqITcvhKo3mSWeA4rkNpM7AWhcTHEvnwpTj F9RNHm4WPQ2oO7kLAe4nWd0tQbZSy57SB2KD7H6OO4adFxDr4tjBmCDq2 F+LuV51PiqU5zPQmEkIcLlJuTxsDAsF140eY4v7MzvtP3Bdvg4RzTrAdJ Q=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: gAyK/eVkDz7CMQK97CdQlC0vs25oYMMAXK9ST9aDVXBBMwAOafyYPSHhke6cTrKF3dbxcLS+Yp d8WwhMSybOtbfB/UWOJGuRygN9q5k3MtEKRB5moJuDehxGC/U/KdiSdWcjwu8pS9CzqvhEqzZM dYDSnexpy7JSg3hpVDT5e7C9jQVZZ1O+ZUMVQreGjEa7ovntNI94uKiOhCTQl6Fm11Sw2N3J/O YIOjaoVXKp1kHikammvPtIVsgXDAWqz4ANiyEJQtYJFaZbKDzslkua8tWJ9V6zcJHqqOu9WF/z r54= X-SBRS: 2.7 X-MesageID: 5555931 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,489,1559534400"; d="scan'208";a="5555931" From: Ian Jackson To: Date: Tue, 10 Sep 2019 13:02:01 +0100 Message-ID: <20190910120207.10358-7-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190910120207.10358-1-ian.jackson@eu.citrix.com> References: <20190910120207.10358-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 06/12] tools/ocaml: abi handling: Provide ocaml->C conversion/check X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Ian Jackson , Christian Lindig , Wei Liu , David Scott Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Andrew Cooper No users of this yet so no overall change. Signed-off-by: Andrew Cooper Signed-off-by: Ian Jackson --- tools/ocaml/libs/xc/abi-check | 3 ++- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/abi-check b/tools/ocaml/libs/xc/abi-check index ccc35e79e9..a470c05e0b 100755 --- a/tools/ocaml/libs/xc/abi-check +++ b/tools/ocaml/libs/xc/abi-check @@ -22,6 +22,7 @@ our $ei; # Parse the C file looking for calls to: # c_bitmap_to_ocaml_list() +# ocaml_list_to_c_bitmap() # # followed by anotations of the following form: # /* ! OType OPrefix Mangle */ @@ -30,7 +31,7 @@ our $ei; # The function definitions use /* ! */ which simply skips that instance. while (<>) { if ($cline == -1) { - if (m/c_bitmap_to_ocaml_list/) { + if (m/c_bitmap_to_ocaml_list|ocaml_list_to_c_bitmap/) { $cline = 0; $ei = { }; } diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 352a6bd2d6..c74c2b43a0 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -153,6 +153,21 @@ static value c_bitmap_to_ocaml_list CAMLreturn(list); } +static unsigned int ocaml_list_to_c_bitmap(value l) + /* ! */ + /* + * All calls to this function must be in a form suitable + * for xenctrl_abi_check. The parsing there is ad-hoc. + */ +{ + unsigned int val; + + for ( ; l != Val_none; l = Field(l, 1) ) + val |= 1u << Int_val(Field(l, 0)); + + return val; +} + CAMLprim value stub_xc_domain_create(value xch, value config) { CAMLparam2(xch, config);