From patchwork Mon Sep 26 16:44:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9351017 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 472AE6077A for ; Mon, 26 Sep 2016 16:46:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 394A028969 for ; Mon, 26 Sep 2016 16:46:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E1F92899E; Mon, 26 Sep 2016 16:46:12 +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 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 A1F1B28989 for ; Mon, 26 Sep 2016 16:46:09 +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 1boZ0u-0007Vq-AE; Mon, 26 Sep 2016 16:44:20 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1boZ0t-0007V7-8O for xen-devel@lists.xenproject.org; Mon, 26 Sep 2016 16:44:19 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 15/3A-11175-26059E75; Mon, 26 Sep 2016 16:44:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsXitHRDpG5SwMt wg/7PzBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8alVzMZCzo5Kl5NOsPcwHicrYuRk0NCwF/i xoptTCA2m4COxMW5O4HiHBwiAioSt/cagISZBYolvq7qYwWxhQVsJHr+fGUEsVkEVCXWrtzGD FLOK+Ai8bAvEGKirsTDc7/ByjkFXCXmn//JDmILAZWsn3AAbCuvgKDEyZlPWCDGa0q0bv/NDm HLSzRvnc0MUa8o0T/vAdSV3BK3T09lnsDIPwtJ+ywk7bOQtC9gZF7FqFGcWlSWWqRrZKSXVJS ZnlGSm5iZo2toYKaXm1pcnJiempOYVKyXnJ+7iREYgAxAsINxzfzAQ4ySHExKoryC/i/DhfiS 8lMqMxKLM+KLSnNSiw8xynBwKEnwPvEDygkWpaanVqRl5gBjASYtwcGjJMIrDdLKW1yQmFucm Q6ROsWoKCXOmwfSJwCSyCjNg2uDxd8lRlkpYV5GoEOEeApSi3IzS1DlXzGKczAqCfN+ApnCk5 lXAjf9FdBiJqDFS0+8AFlckoiQkmpg9BGWZBTwmf3dZLV2wVKjZYXO+aVq521+TGtiXnxn1aF pvNEG4ScXPvDrr5zaZHTi4rXCK3Ob2lqaE1jcny5NZXM6FfZZpvDUBcVE9c1zU9RTT8xV9OwR DlT9xjDjIXtg/oudW3d4PGFjmbt7cZCudpDjQc9q738LTkR0/l5343XiKpVbWR1MSizFGYmGW sxFxYkA+jAFwboCAAA= X-Env-Sender: prvs=07040cf8d=roger.pau@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1474908256!8514940!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.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28883 invoked from network); 26 Sep 2016 16:44:17 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 26 Sep 2016 16:44:17 -0000 X-IronPort-AV: E=Sophos;i="5.30,400,1470700800"; d="scan'208";a="380682695" From: Roger Pau Monne To: Date: Mon, 26 Sep 2016 18:44:08 +0200 Message-ID: <1474908249-22819-2-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) In-Reply-To: <1474908249-22819-1-git-send-email-roger.pau@citrix.com> References: <1474908249-22819-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Wei Liu , Ian Jackson , Roger Pau Monne Subject: [Xen-devel] [PATCH 1/2] lib/gnttab: fix build of gnttab_unimp.c 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-Virus-Scanned: ClamAV using ClamSMTP Fix the definition of the xengnttab_grant_copy function so it's inline with the prototypes in xengnttab.h. This unbreaks the tools build on systems that don't have a gnttab device. Signed-off-by: Roger Pau Monné Cc: Ian Jackson Cc: Wei Liu Acked-by: Wei Liu --- tools/libs/gnttab/gnttab_unimp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libs/gnttab/gnttab_unimp.c b/tools/libs/gnttab/gnttab_unimp.c index 829eced..26e4ee1 100644 --- a/tools/libs/gnttab/gnttab_unimp.c +++ b/tools/libs/gnttab/gnttab_unimp.c @@ -78,9 +78,9 @@ int xengnttab_unmap(xengnttab_handle *xgt, void *start_address, uint32_t count) abort(); } -int xengnttab_copy_grant(xengnttab_handle *xgt, +int xengnttab_grant_copy(xengnttab_handle *xgt, uint32_t count, - xengnttab_copy_grant_segment_t *segs) + xengnttab_grant_copy_segment_t *segs) { abort(); }