From patchwork Tue Sep 10 15:17:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11139753 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 3D17814DB for ; Tue, 10 Sep 2019 15:20:32 +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 171762168B for ; Tue, 10 Sep 2019 15:20:32 +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="foKXnHNW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 171762168B 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 1i7hud-0002Ol-TQ; Tue, 10 Sep 2019 15:18:35 +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 1i7huc-0002OO-8x for xen-devel@lists.xenproject.org; Tue, 10 Sep 2019 15:18:34 +0000 X-Inumbo-ID: 3fe5c252-d3de-11e9-ac1f-12813bfff9fa Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3fe5c252-d3de-11e9-ac1f-12813bfff9fa; Tue, 10 Sep 2019 15:18:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568128713; h=from:to:cc:subject:date:message-id:mime-version; bh=PdLFScxDIhTc+vZh/i0ruuu2uWhe2SbqTfhGqg/yEAc=; b=foKXnHNW/URlYifYROfKDy2TizW90dRH1WrB5GQBh0Mw/l6rzRKrVLyj DjTRr+XWMi43bRb7Awj19aQ+G1t/w/ajoAxbuZiEunnNuXLH6Ru9oWVDb 8pIHacfJfxJ3Gkq+HoHIsvaAz8CEnnhtS/5b1r/MU0H2JUAF+Dy/4SLb7 k=; Authentication-Results: esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.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=esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: zOcCYuMztLYtfaLw/ILhXWmDlyjhPnurirDz7PROFAegfTIRDf6ZQ5pQkfg/q6Fdmx4cZIi4hg C3pUnFyVNQs6oFAFYgOgiAHtFtMpfBUdnfRPnzfSJhdT+FiPg4cjuTh/Y0U5EFtRXqzMZjD0c6 Dtdm8ya4Rcixf6MoR78kn3OCZ8lbckN/9nhgiR1YG7hjya4Yuaeu8r48uga826tunI2d+qqwZT 6A0mdcbpnt2+g0yAG6/XHx5DkZ4Uy2igI/xIf2ixcr8lAfGNyJ0O5T6iMxM0ddEOhctu8kQY0Y Kww= X-SBRS: 2.7 X-MesageID: 5380434 X-Ironport-Server: esa2.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="5380434" From: Ian Jackson To: Date: Tue, 10 Sep 2019 16:17:58 +0100 Message-ID: <20190910151758.8447-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] tools/ocaml: abi check: #include on x86 only 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" Reported-by: Andrew Cooper Signed-off-by: Ian Jackson Acked-by: Andrew Cooper --- tools/ocaml/libs/xc/xenctrl_stubs.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index f86ecc7b7e..3eff6dd8c2 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -135,7 +135,20 @@ static value c_bitmap_to_ocaml_list CAMLparam0(); CAMLlocal2(list, tmp); +#if defined(__i386__) || defined(__x86_64__) +/* + * This check file contains a mixture of stuff, because it is + * generated from the whole of this xenctrl_stubs.c file (without + * regard to arch ifdefs) and the whole of xenctrl.ml (which does not + * have any arch ifdeffery). Currently, there is only x86 and + * arch-independent stuff, and there is no facility in the abi-check + * script for arch conditionals. So for now we make the checks + * effective on x86 only; this will suffice to defend even ARM + * because breaking changes to common code will break the build + * on x86 and not make it to master. This is a bit of a bodge. + */ #include "xenctrl_abi_check.h" +#endif list = tmp = Val_emptylist;