From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E29FAA0A02 for ; Mon, 17 May 2021 18:10:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D73CA40041; Mon, 17 May 2021 18:10:52 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 878B0410E2 for ; Mon, 17 May 2021 18:10:50 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifpP-0007VZ-PK; Mon, 17 May 2021 16:10:47 +0000 From: Christian Ehrhardt To: Yunjian Wang Cc: Anatoly Burakov , dpdk stable Date: Mon, 17 May 2021 18:07:14 +0200 Message-Id: <20210517161039.3132619-5-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vfio: fix API description' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0611571465cb3aefdd8394966b43ebe7f1706106 Thanks. Christian Ehrhardt --- >From 0611571465cb3aefdd8394966b43ebe7f1706106 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Sat, 6 Jun 2020 17:17:20 +0800 Subject: [PATCH] vfio: fix API description [ upstream commit 8d63961fc7137cab823f85a50ee82779792f21e4 ] Fix few comments and add detailed comments for return value. Fixes: 279b581c897d ("vfio: expose functions") Signed-off-by: Yunjian Wang Acked-by: Anatoly Burakov --- lib/librte_eal/common/include/rte_vfio.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/common/include/rte_vfio.h b/lib/librte_eal/common/include/rte_vfio.h index 20ed8c45a9..e7a87454be 100644 --- a/lib/librte_eal/common/include/rte_vfio.h +++ b/lib/librte_eal/common/include/rte_vfio.h @@ -156,7 +156,7 @@ int rte_vfio_enable(const char *modname); * kernel module name. * * @return - * !0 if true. + * 1 if true. * 0 otherwise. */ int rte_vfio_is_enabled(const char *modname); @@ -168,8 +168,9 @@ int rte_vfio_is_enabled(const char *modname); * an error on BSD. * * @return - * !0 if true. - * 0 otherwise. + * 1 if true. + * 0 if false. + * <0 for errors. */ int rte_vfio_noiommu_is_enabled(void); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:29.792380544 +0200 +++ 0005-vfio-fix-API-description.patch 2021-05-17 17:40:29.091808846 +0200 @@ -1 +1 @@ -From 8d63961fc7137cab823f85a50ee82779792f21e4 Mon Sep 17 00:00:00 2001 +From 0611571465cb3aefdd8394966b43ebe7f1706106 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8d63961fc7137cab823f85a50ee82779792f21e4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/librte_eal/include/rte_vfio.h | 7 ++++--- + lib/librte_eal/common/include/rte_vfio.h | 7 ++++--- @@ -17 +18 @@ -diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h +diff --git a/lib/librte_eal/common/include/rte_vfio.h b/lib/librte_eal/common/include/rte_vfio.h @@ -19,2 +20,2 @@ ---- a/lib/librte_eal/include/rte_vfio.h -+++ b/lib/librte_eal/include/rte_vfio.h +--- a/lib/librte_eal/common/include/rte_vfio.h ++++ b/lib/librte_eal/common/include/rte_vfio.h