From patchwork Fri Feb 10 21:51:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 9567539 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EEB2E60573 for ; Fri, 10 Feb 2017 21:54:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE9A3285CE for ; Fri, 10 Feb 2017 21:54:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D37DA285D6; Fri, 10 Feb 2017 21:54:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 56631285CF for ; Fri, 10 Feb 2017 21:54:10 +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 1ccJ6l-0000Wb-CK; Fri, 10 Feb 2017 21:51:59 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ccJ6k-0000W2-1r for xen-devel@lists.xenproject.org; Fri, 10 Feb 2017 21:51:58 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 30/0E-25093-DF53E985; Fri, 10 Feb 2017 21:51:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsXSO6nOVfeP6bw Ig7/zLCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oz9v7uYCy5yVhzbs5epgfE8excjF4eQwEQm iZ0zOxi7GDmBnG+MEucWyEIkNjJKfDo0hxHC6WGUuDZ7AXMXIwcHm4CJxJtVjiCmiIC1xNXF6 SC9zAJGEpMb37GAhIUFDCReT1QEMVkEVCXudjGCmLxAxYfO1IMUSwjISVza9oUZxOYUsJG48f 4+E8QB1hK9j6awQtQYSnzeuJR5AiPfAkaGVYwaxalFZalFukbmeklFmekZJbmJmTm6hgZmerm pxcWJ6ak5iUnFesn5uZsYgQHCAAQ7GBevDTzEKMnBpCTK+4xzXoQQX1J+SmVGYnFGfFFpTmrx IUYZDg4lCV4/E6CcYFFqempFWmYOMFRh0hIcPEoivPNB0rzFBYm5xZnpEKlTjIpS4rzKwAAXE gBJZJTmwbXB4uMSo6yUMC8j0CFCPAWpRbmZJajyrxjFORiVhHnZQabwZOaVwE1/BbSYCWix64 O5IItLEhFSUg2MDNlf1bmEI7e17+H7MzX504ktLxPeeez88+LBVP49z1PnfVzMpPv6jOqCSVc 5Plj3e73y+sPu1dfx8dbPeJmriU+trs0oVyrdfjbQLtbGiOdbpVHRm28n3gVf9r6yzVEl+82+ 39cVrpS0LZtnyRTByX7reUtlR7t+UvD+hv2Ns18aus7uLI1OV2Ipzkg01GIuKk4EAKU+ASmKA gAA X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1486763515!34154969!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29803 invoked from network); 10 Feb 2017 21:51:56 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Feb 2017 21:51:56 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v1ALpott017745 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 10 Feb 2017 21:51:51 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v1ALpn6a019850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 10 Feb 2017 21:51:50 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id v1ALpl5Z024155; Fri, 10 Feb 2017 21:51:48 GMT Received: from x230.dumpdata.com.com (/10.154.127.5) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 10 Feb 2017 13:51:47 -0800 From: Konrad Rzeszutek Wilk To: paul.durrant@citrix.com, xen-devel@lists.xenproject.org Date: Fri, 10 Feb 2017 16:51:36 -0500 Message-Id: <20170210215136.25335-2-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170210215136.25335-1-konrad.wilk@oracle.com> References: <20170210215136.25335-1-konrad.wilk@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH] Make it compiler under Xen 4.7. 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP With b7f76a699dcfadc0a52ab45b33cc72dbf3a69e7b Author: Ian Campbell Date: Mon Jun 1 16:20:09 2015 +0100 tools: Refactor /dev/xen/evtchn wrappers into libxenevtchn. commit 32486916793fd78a41fc25e53d2b53a5aa0b1bd5 Author: Ian Campbell Date: Thu Jun 18 16:30:19 2015 +0100 tools: Refactor foreign memory mapping into libxenforeignmemory We need to use the compat layer. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Paul Durrant --- CC: paul.durrant@citrix.com v1: First version --- demu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/demu.c b/demu.c index 2933efb..7d73a69 100644 --- a/demu.c +++ b/demu.c @@ -56,7 +56,12 @@ #include +#define XC_WANT_COMPAT_MAP_FOREIGN_API 1 +#define XC_WANT_COMPAT_EVTCHN_API 1 + #include +#include + #include #include "debug.h" @@ -126,7 +131,7 @@ typedef enum { typedef struct demu_state { demu_seq_t seq; xc_interface *xch; - xc_interface *xceh; + xc_evtchn *xceh; domid_t domid; unsigned int vcpus; ioservid_t ioservid;