timer: remove useless check on x86 TSC reliability

[dpdk.git] / app / test-pmd / parameters.c

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 245b610..6c78dca 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -39,10 +39,6 @@
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
-#ifdef RTE_LIBRTE_CMDLINE
-#include <cmdline_parse.h>
-#include <cmdline_parse_etheraddr.h>
-#endif
 #ifdef RTE_LIBRTE_PMD_BOND
 #include <rte_eth_bond.h>
 #endif
@@ -178,6 +174,7 @@ usage(char* progname)
        printf("  --txonly-multi-flow: generate multiple flows in txonly mode\n");
        printf("  --disable-link-check: disable check on link status when "
               "starting/stopping ports.\n");
+       printf("  --disable-device-start: do not automatically start port\n");
        printf("  --no-lsc-interrupt: disable link status change interrupt.\n");
        printf("  --no-rmv-interrupt: disable device removal interrupt.\n");
        printf("  --bitrate-stats=N: set the logical core N to perform "
@@ -227,8 +224,7 @@ init_peer_eth_addrs(char *config_filename)
                if (fgets(buf, sizeof(buf), config_file) == NULL)
                        break;
 
-               if (cmdline_parse_etheraddr(NULL, buf, &peer_eth_addrs[i],
-                               sizeof(peer_eth_addrs[i])) < 0) {
+               if (rte_ether_unformat_addr(buf, &peer_eth_addrs[i]) < 0) {
                        printf("Bad MAC address format on line %d\n", i+1);
                        fclose(config_file);
                        return -1;
@@ -566,6 +562,7 @@ launch_args_parse(int argc, char** argv)
        uint64_t tx_offloads = tx_mode.offloads;
        struct rte_eth_dev_info dev_info;
        uint16_t rec_nb_pkts;
+       int ret;
 
        static struct option lgopts[] = {
                { "help",                       0, 0, 0 },
@@ -639,6 +636,7 @@ launch_args_parse(int argc, char** argv)
                { "txpkts",                     1, 0, 0 },
                { "txonly-multi-flow",          0, 0, 0 },
                { "disable-link-check",         0, 0, 0 },
+               { "disable-device-start",       0, 0, 0 },
                { "no-lsc-interrupt",           0, 0, 0 },
                { "no-rmv-interrupt",           0, 0, 0 },
                { "print-event",                1, 0, 0 },
@@ -727,7 +725,6 @@ launch_args_parse(int argc, char** argv)
                        }
                        if (!strcmp(lgopts[opt_idx].name, "eth-peer")) {
                                char *port_end;
-                               uint8_t c, peer_addr[6];
 
                                errno = 0;
                                n = strtoul(optarg, &port_end, 10);
@@ -739,14 +736,11 @@ launch_args_parse(int argc, char** argv)
                                                 "eth-peer: port %d >= RTE_MAX_ETHPORTS(%d)\n",
                                                 n, RTE_MAX_ETHPORTS);
 
-                               if (cmdline_parse_etheraddr(NULL, port_end,
-                                               &peer_addr, sizeof(peer_addr)) < 0)
+                               if (rte_ether_unformat_addr(port_end,
+                                               &peer_eth_addrs[n]) < 0)
                                        rte_exit(EXIT_FAILURE,
                                                 "Invalid ethernet address: %s\n",
                                                 port_end);
-                               for (c = 0; c < 6; c++)
-                                       peer_eth_addrs[n].addr_bytes[c] =
-                                               peer_addr[c];
                                nb_peer_eth_addrs++;
                        }
 #endif
@@ -1057,7 +1051,12 @@ launch_args_parse(int argc, char** argv)
                                         * value, on the assumption that all
                                         * ports are of the same NIC model.
                                         */
-                                       rte_eth_dev_info_get(0, &dev_info);
+                                       ret = eth_dev_info_get_print_err(
+                                                               0,
+                                                               &dev_info);
+                                       if (ret != 0)
+                                               return;
+
                                        rec_nb_pkts = dev_info
                                                .default_rxportconf.burst_size;
 
@@ -1205,6 +1204,8 @@ launch_args_parse(int argc, char** argv)
                                no_flush_rx = 1;
                        if (!strcmp(lgopts[opt_idx].name, "disable-link-check"))
                                no_link_check = 1;
+                       if (!strcmp(lgopts[opt_idx].name, "disable-device-start"))
+                               no_device_start = 1;
                        if (!strcmp(lgopts[opt_idx].name, "no-lsc-interrupt"))
                                lsc_interrupt = 0;
                        if (!strcmp(lgopts[opt_idx].name, "no-rmv-interrupt"))