[dpdk-stable] patch 'examples/vm_power: fix build without i40e' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/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.

Thanks.

Luca Boccassi

---
>From 3b096e804f651a3b15826ee8e37ef13a666ab5f6 Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt at intel.com>
Date: Thu, 24 Oct 2019 15:26:10 +0100
Subject: [PATCH] examples/vm_power: fix build without i40e

[ upstream commit e4d028a0fb53809a341f62a39e59f9e13e7c7f59 ]

channel_monitor.c was dependent on i40e driver being available.
This is only necessary for the TRAFFIC policy, so use #ifdef's
to not call these when i40e not available.

Fixes: f14791a8126e ("examples/vm_power_mgr: add policy to channels")

Signed-off-by: David Hunt <david.hunt at intel.com>
Tested-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 examples/vm_power_manager/channel_monitor.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
index 37e71ed905..6e73d54dd5 100644
--- a/examples/vm_power_manager/channel_monitor.c
+++ b/examples/vm_power_manager/channel_monitor.c
@@ -49,7 +49,9 @@
 #include <rte_atomic.h>
 #include <rte_cycles.h>
 #include <rte_ethdev.h>
+#ifdef RTE_LIBRTE_I40E_PMD
 #include <rte_pmd_i40e.h>
+#endif
 
 #include <libvirt/libvirt.h>
 #include "channel_monitor.h"
@@ -145,8 +147,12 @@ get_pfid(struct policy *pol)
 	for (i = 0; i < pol->pkt.nb_mac_to_monitor; i++) {
 
 		for (x = 0; x < nb_ports; x++) {
+#ifdef RTE_LIBRTE_I40E_PMD
 			ret = rte_pmd_i40e_query_vfid_by_mac(x,
 				(struct ether_addr *)&(pol->pkt.vfid[i]));
+#else
+			ret = -ENOTSUP;
+#endif
 			if (ret != -EINVAL) {
 				pol->port[i] = x;
 				break;
@@ -209,15 +215,21 @@ get_pkt_diff(struct policy *pol)
 		vsi_pkt_count_prev_total = 0;
 	double rdtsc_curr, rdtsc_diff, diff;
 	int x;
+#ifdef RTE_LIBRTE_I40E_PMD
 	struct rte_eth_stats vf_stats;
+#endif
 
 	for (x = 0; x < pol->pkt.nb_mac_to_monitor; x++) {
 
+#ifdef RTE_LIBRTE_I40E_PMD
 		/*Read vsi stats*/
 		if (rte_pmd_i40e_get_vf_stats(x, pol->pfid[x], &vf_stats) == 0)
 			vsi_pkt_count = vf_stats.ipackets;
 		else
 			vsi_pkt_count = -1;
+#else
+		vsi_pkt_count = -1;
+#endif
 
 		vsi_pkt_total += vsi_pkt_count;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:30.153668706 +0000
+++ 0096-examples-vm_power-fix-build-without-i40e.patch	2019-12-19 14:32:26.225300205 +0000
@@ -1,14 +1,15 @@
-From e4d028a0fb53809a341f62a39e59f9e13e7c7f59 Mon Sep 17 00:00:00 2001
+From 3b096e804f651a3b15826ee8e37ef13a666ab5f6 Mon Sep 17 00:00:00 2001
 From: David Hunt <david.hunt at intel.com>
 Date: Thu, 24 Oct 2019 15:26:10 +0100
 Subject: [PATCH] examples/vm_power: fix build without i40e
 
+[ upstream commit e4d028a0fb53809a341f62a39e59f9e13e7c7f59 ]
+
 channel_monitor.c was dependent on i40e driver being available.
 This is only necessary for the TRAFFIC policy, so use #ifdef's
 to not call these when i40e not available.
 
 Fixes: f14791a8126e ("examples/vm_power_mgr: add policy to channels")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Hunt <david.hunt at intel.com>
 Tested-by: Bruce Richardson <bruce.richardson at intel.com>
@@ -18,10 +19,10 @@
  1 file changed, 12 insertions(+)
 
 diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
-index 0c73fac558..29e1cb64d0 100644
+index 37e71ed905..6e73d54dd5 100644
 --- a/examples/vm_power_manager/channel_monitor.c
 +++ b/examples/vm_power_manager/channel_monitor.c
-@@ -28,7 +28,9 @@
+@@ -49,7 +49,9 @@
  #include <rte_atomic.h>
  #include <rte_cycles.h>
  #include <rte_ethdev.h>
@@ -31,20 +32,20 @@
  
  #include <libvirt/libvirt.h>
  #include "channel_monitor.h"
-@@ -436,8 +438,12 @@ get_pfid(struct policy *pol)
+@@ -145,8 +147,12 @@ get_pfid(struct policy *pol)
  	for (i = 0; i < pol->pkt.nb_mac_to_monitor; i++) {
  
- 		RTE_ETH_FOREACH_DEV(x) {
+ 		for (x = 0; x < nb_ports; x++) {
 +#ifdef RTE_LIBRTE_I40E_PMD
  			ret = rte_pmd_i40e_query_vfid_by_mac(x,
- 				(struct rte_ether_addr *)&(pol->pkt.vfid[i]));
+ 				(struct ether_addr *)&(pol->pkt.vfid[i]));
 +#else
 +			ret = -ENOTSUP;
 +#endif
  			if (ret != -EINVAL) {
  				pol->port[i] = x;
  				break;
-@@ -531,15 +537,21 @@ get_pkt_diff(struct policy *pol)
+@@ -209,15 +215,21 @@ get_pkt_diff(struct policy *pol)
  		vsi_pkt_count_prev_total = 0;
  	double rdtsc_curr, rdtsc_diff, diff;
  	int x;