From patchwork Mon Sep 9 17:12:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11138301 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 8D806924 for ; Mon, 9 Sep 2019 17:14:54 +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 698622089F for ; Mon, 9 Sep 2019 17:14:54 +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="Ap7BGXVU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 698622089F 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 1i7NDk-0007rz-Vz; Mon, 09 Sep 2019 17:12:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i7NDk-0007rr-Fn for xen-devel@lists.xenproject.org; Mon, 09 Sep 2019 17:12:56 +0000 X-Inumbo-ID: 1064023c-d325-11e9-a337-bc764e2007e4 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1064023c-d325-11e9-a337-bc764e2007e4; Mon, 09 Sep 2019 17:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568049175; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=lCLITtXy5sNnF7LpRpR42YQtxBpfKfNIVGG7coBgFq0=; b=Ap7BGXVUGVVAFnkkZzpkD7pEXpqG5w9EsjcLYNwF0GD3dsReHNjzWBU4 zhjGFzK+Yve8Erd6YYauQzBXM97ujGWGBB97W1GZNgP9QUSEk27KtTkOm MNUYXIkKHy0YToQdk5Yplx6b7d8DqdqQ1NksQIIc406FRKjU53zOv2pRV o=; 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: wCLvXhy6bOLKSzP9DShr02Qf3Edyz6gcUnMjBP2cqdr5UBNVm1vZm+yx/m/JxFSJuE9T2UpcD+ hD64M3otiIYy7sEq3uX8gSUBRpC5IqtxcCn2J/6cYl279W22EWkE22emLoj6r5hRF0usuzmrzc 6qKCk1eckYllYO3PFSkZBDWzl+ItAs8S63TSIpHpI/oBDTq/j2mriApF5yy7L6TJ0650cEpn56 PvBMeRyZCK7a1UgFb8ZSnZFT77447En6JLz32Op9C510QW4yiHP/kvHu7vjl3TP2BL+VJwyPzM wd0= X-SBRS: 2.7 X-MesageID: 5518160 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,486,1559534400"; d="scan'208";a="5518160" From: Ian Jackson To: Date: Mon, 9 Sep 2019 18:12:05 +0100 Message-ID: <20190909171206.25585-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190909171206.25585-1-ian.jackson@eu.citrix.com> References: <20190909171206.25585-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 2/3] tools/ocaml: Add missing CAP_PV 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 c/s f089fddd941 broke the Ocaml ABI by renumering XEN_SYSCTL_PHYSCAP_directio without adjusting the Ocaml physinfo_cap_flag enumeration. Fix this by inserting CAP_PV between CAP_HVM and CAP_DirectIO. Signed-off-by: Andrew Cooper Signed-off-by: Ian Jackson --- v2: Split this into its own patch. --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 305625cb6c..097f39d5ce 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -100,6 +100,7 @@ type sched_control = type physinfo_cap_flag = | CAP_HVM + | CAP_PV | CAP_DirectIO type physinfo = diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index da93160ed3..957c9fdc2e 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -83,7 +83,10 @@ type domaininfo = { arch_config : arch_domainconfig; } type sched_control = { weight : int; cap : int; } -type physinfo_cap_flag = CAP_HVM | CAP_DirectIO +type physinfo_cap_flag = + | CAP_HVM + | CAP_PV + | CAP_DirectIO type physinfo = { threads_per_core : int; cores_per_socket : int;