examples: fix port mask parsing failure handling

[dpdk.git] / examples / qos_meter / main.c

diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c
index 431e84f..ce87b2e 100644 (file)
--- a/examples/qos_meter/main.c
+++ b/examples/qos_meter/main.c
@@ -54,7 +54,7 @@ static struct rte_mempool *pool = NULL;
 static struct rte_eth_conf port_conf = {
        .rxmode = {
                .mq_mode        = ETH_MQ_RX_RSS,
-               .max_rx_pkt_len = ETHER_MAX_LEN,
+               .max_rx_pkt_len = RTE_ETHER_MAX_LEN,
                .split_hdr_size = 0,
                .offloads = DEV_RX_OFFLOAD_CHECKSUM,
        },
@@ -156,7 +156,7 @@ app_pkt_handle(struct rte_mbuf *pkt, uint64_t time)
                &PROFILE,
                time,
                pkt_len,
-               (enum rte_meter_color) input_color);
+               (enum rte_color) input_color);
 
        /* Apply policing and set the output color */
        action = policer_table[input_color][output_color];
@@ -166,8 +166,8 @@ app_pkt_handle(struct rte_mbuf *pkt, uint64_t time)
 }
 
 
-static __attribute__((noreturn)) int
-main_loop(__attribute__((unused)) void *dummy)
+static __rte_noreturn int
+main_loop(__rte_unused void *dummy)
 {
        uint64_t current_time, last_time = rte_rdtsc();
        uint32_t lcore_id = rte_lcore_id();
@@ -220,10 +220,7 @@ parse_portmask(const char *portmask)
        /* parse hexadecimal string */
        pm = strtoul(portmask, &end, 16);
        if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
-               return -1;
-
-       if (pm == 0)
-               return -1;
+               return 0;
 
        return pm;
 }
@@ -329,7 +326,13 @@ main(int argc, char **argv)
 
        /* NIC init */
        conf = port_conf;
-       rte_eth_dev_info_get(port_rx, &dev_info);
+
+       ret = rte_eth_dev_info_get(port_rx, &dev_info);
+       if (ret != 0)
+               rte_exit(EXIT_FAILURE,
+                       "Error during getting device (port %u) info: %s\n",
+                       port_rx, strerror(-ret));
+
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 
@@ -369,7 +372,13 @@ main(int argc, char **argv)
        rte_exit(EXIT_FAILURE, "Port %d TX queue setup error (%d)\n", port_rx, ret);
 
        conf = port_conf;
-       rte_eth_dev_info_get(port_tx, &dev_info);
+
+       ret = rte_eth_dev_info_get(port_tx, &dev_info);
+       if (ret != 0)
+               rte_exit(EXIT_FAILURE,
+                       "Error during getting device (port %u) info: %s\n",
+                       port_tx, strerror(-ret));
+
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 
@@ -427,9 +436,17 @@ main(int argc, char **argv)
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d start error (%d)\n", port_tx, ret);
 
-       rte_eth_promiscuous_enable(port_rx);
-
-       rte_eth_promiscuous_enable(port_tx);
+       ret = rte_eth_promiscuous_enable(port_rx);
+       if (ret != 0)
+               rte_exit(EXIT_FAILURE,
+                       "Port %d promiscuous mode enable error (%s)\n",
+                       port_rx, rte_strerror(-ret));
+
+       ret = rte_eth_promiscuous_enable(port_tx);
+       if (ret != 0)
+               rte_exit(EXIT_FAILURE,
+                       "Port %d promiscuous mode enable error (%s)\n",
+                       port_rx, rte_strerror(-ret));
 
        /* App configuration */
        ret = app_configure_flow_table();