From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id A1C62A0096 for ; Wed, 8 May 2019 12:16:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 984952862; Wed, 8 May 2019 12:16:48 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 780882862 for ; Wed, 8 May 2019 12:16:47 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA506305B886; Wed, 8 May 2019 10:16:46 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id C29781A267; Wed, 8 May 2019 10:16:45 +0000 (UTC) From: Kevin Traynor To: David Christensen Cc: David Hunt , dpdk stable Date: Wed, 8 May 2019 11:15:16 +0100 Message-Id: <20190508101534.8984-34-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 08 May 2019 10:16:46 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/power: fix build with some disabled PMDs' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.2 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/13/19. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a7f5ed7bb32e064a3ae3f1e723c0cefcb1bea888 Thanks. Kevin Traynor --- >From a7f5ed7bb32e064a3ae3f1e723c0cefcb1bea888 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Tue, 2 Apr 2019 14:46:12 -0400 Subject: [PATCH] examples/power: fix build with some disabled PMDs [ upstream commit 70b2c7f12c2fbc32ca0f7784c69e52717483ea1b ] Running the devtools/test-build.sh script on IBM Power systems fails because the IXGBE_PMD is explicity disabled for Power as an untested driver, but the examples/vm_power_manager application has a hard dependency on a function call in the IXGBE_PMD. Modify the example application so that all dependencies on PMD code are conditionally compiled. Bugzilla ID: 237 Fixes: c9a4779135c9 ("examples/vm_power_mgr: set MAC address of VF") Signed-off-by: David Christensen Acked-by: David Hunt --- examples/vm_power_manager/main.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c index 1a846af71..5fa13fe62 100644 --- a/examples/vm_power_manager/main.c +++ b/examples/vm_power_manager/main.c @@ -32,7 +32,13 @@ #include "oob_monitor.h" #include "parse.h" +#ifdef RTE_LIBRTE_IXGBE_PMD #include +#endif +#ifdef RTE_LIBRTE_I40E_PMD #include +#endif +#ifdef RTE_LIBRTE_BNXT_PMD #include +#endif #define RX_RING_SIZE 1024 @@ -371,12 +377,19 @@ main(int argc, char **argv) eth.addr_bytes[5] = w + 0xf0; + ret = -ENOTSUP; +#ifdef RTE_LIBRTE_IXGBE_PMD ret = rte_pmd_ixgbe_set_vf_mac_addr(portid, w, ð); +#endif +#ifdef RTE_LIBRTE_I40E_PMD if (ret == -ENOTSUP) ret = rte_pmd_i40e_set_vf_mac_addr( portid, w, ð); +#endif +#ifdef RTE_LIBRTE_BNXT_PMD if (ret == -ENOTSUP) ret = rte_pmd_bnxt_set_vf_mac_addr( portid, w, ð); +#endif switch (ret) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.520284426 +0100 +++ 0034-examples-power-fix-build-with-some-disabled-PMDs.patch 2019-05-08 11:05:05.816933033 +0100 @@ -1 +1 @@ -From 70b2c7f12c2fbc32ca0f7784c69e52717483ea1b Mon Sep 17 00:00:00 2001 +From a7f5ed7bb32e064a3ae3f1e723c0cefcb1bea888 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,2 @@ + +[ upstream commit 70b2c7f12c2fbc32ca0f7784c69e52717483ea1b ]