examples/vm_power: fix build without i40e
authorDavid Hunt <david.hunt@intel.com>
Thu, 24 Oct 2019 14:26:10 +0000 (15:26 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Sun, 27 Oct 2019 18:38:02 +0000 (19:38 +0100)
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@dpdk.org
Signed-off-by: David Hunt <david.hunt@intel.com>
Tested-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
examples/vm_power_manager/channel_monitor.c

index 0c73fac..29e1cb6 100644 (file)
@@ -28,7 +28,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"
@@ -436,8 +438,12 @@ get_pfid(struct policy *pol)
        for (i = 0; i < pol->pkt.nb_mac_to_monitor; i++) {
 
                RTE_ETH_FOREACH_DEV(x) {
+#ifdef RTE_LIBRTE_I40E_PMD
                        ret = rte_pmd_i40e_query_vfid_by_mac(x,
                                (struct rte_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)
                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;