diff options
author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-07-04 10:40:06 +0200 |
---|---|---|
committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-07-04 10:48:05 +0200 |
commit | 8d53e9f3c6001dcb2865f6e894da5b54e1418f88 (patch) | |
tree | 63907f21c13636a987d43463c675d0727a04e327 /examples/vm_power_manager/main.c | |
parent | e2bea7436061ca2e7e14bfcfdc5870f2555c3965 (diff) |
New upstream version 18.11.2upstream-18.11-stable
Change-Id: I23eb4f9179abf1f9c659891f8fddb27ee68ad26b
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'examples/vm_power_manager/main.c')
-rw-r--r-- | examples/vm_power_manager/main.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c index 893bf4cd..5fa13fe6 100644 --- a/examples/vm_power_manager/main.c +++ b/examples/vm_power_manager/main.c @@ -31,9 +31,15 @@ #include "vm_power_cli.h" #include "oob_monitor.h" #include "parse.h" +#ifdef RTE_LIBRTE_IXGBE_PMD #include <rte_pmd_ixgbe.h> +#endif +#ifdef RTE_LIBRTE_I40E_PMD #include <rte_pmd_i40e.h> +#endif +#ifdef RTE_LIBRTE_BNXT_PMD #include <rte_pmd_bnxt.h> +#endif #define RX_RING_SIZE 1024 #define TX_RING_SIZE 1024 @@ -175,6 +181,7 @@ parse_args(int argc, char **argv) if (cnt < 0) { printf("Invalid core-list - [%s]\n", optarg); + free(oob_enable); break; } for (i = 0; i < ci->core_count; i++) { @@ -369,14 +376,21 @@ main(int argc, char **argv) for (w = 0; w < MAX_VFS; w++) { 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) { case 0: @@ -390,7 +404,6 @@ main(int argc, char **argv) break; } printf("\n"); - break; } } } |