Small changes in several examples to replace master_lcore
with initial_lcore across multiple small examples.

Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
 examples/eventdev_pipeline/main.c      |  2 +-
 examples/flow_classify/flow_classify.c |  2 +-
 examples/helloworld/main.c             |  6 +++---
 examples/ioat/ioatfwd.c                |  6 +++---
 examples/ip_fragmentation/main.c       |  4 ++--
 examples/ip_reassembly/main.c          |  4 ++--
 examples/ipv4_multicast/main.c         |  4 ++--
 examples/kni/main.c                    |  7 +++----
 examples/link_status_interrupt/main.c  |  8 ++++----
 examples/ntb/ntb_fwd.c                 | 14 +++++++-------
 examples/packet_ordering/main.c        | 22 +++++++++++-----------
 examples/rxtx_callbacks/main.c         |  2 +-
 examples/server_node_efd/server/main.c | 10 +++++-----
 examples/skeleton/basicfwd.c           |  2 +-
 examples/tep_termination/main.c        | 12 ++++++------
 examples/timer/main.c                  |  8 ++++----
 examples/vhost/main.c                  | 10 +++++-----
 examples/vmdq/main.c                   |  4 ++--
 examples/vmdq_dcb/main.c               |  6 +++---
 19 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/examples/eventdev_pipeline/main.c 
b/examples/eventdev_pipeline/main.c
index 21958269f743..91969ce039cf 100644
--- a/examples/eventdev_pipeline/main.c
+++ b/examples/eventdev_pipeline/main.c
@@ -395,7 +395,7 @@ main(int argc, char **argv)
        }
 
        int worker_idx = 0;
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (lcore_id >= MAX_NUM_CORE)
                        break;
 
diff --git a/examples/flow_classify/flow_classify.c 
b/examples/flow_classify/flow_classify.c
index 433e64d3f901..e8d23225c4b8 100644
--- a/examples/flow_classify/flow_classify.c
+++ b/examples/flow_classify/flow_classify.c
@@ -850,7 +850,7 @@ main(int argc, char *argv[])
                rte_exit(EXIT_FAILURE, "Failed to add rules\n");
        }
 
-       /* Call lcore_main on the master core only. */
+       /* Call lcore_main on the initial core only. */
        lcore_main(cls_app);
 
        return 0;
diff --git a/examples/helloworld/main.c b/examples/helloworld/main.c
index 968045f1b042..029bee26cba2 100644
--- a/examples/helloworld/main.c
+++ b/examples/helloworld/main.c
@@ -34,12 +34,12 @@ main(int argc, char **argv)
        if (ret < 0)
                rte_panic("Cannot init EAL\n");
 
-       /* call lcore_hello() on every slave lcore */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       /* call lcore_hello() on every worker lcore */
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                rte_eal_remote_launch(lcore_hello, NULL, lcore_id);
        }
 
-       /* call it on master lcore too */
+       /* call it on initial lcore too */
        lcore_hello(NULL);
 
        rte_eal_mp_wait_lcore();
diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
index b66ee73bcec4..919c95e425b2 100644
--- a/examples/ioat/ioatfwd.c
+++ b/examples/ioat/ioatfwd.c
@@ -520,7 +520,7 @@ tx_main_loop(void)
                        ioat_tx_port(&cfg.ports[i]);
 }
 
-/* Main rx and tx loop if only one slave lcore available */
+/* Main rx and tx loop if only one worker lcore available */
 static void
 rxtx_main_loop(void)
 {
@@ -984,7 +984,7 @@ main(int argc, char **argv)
        cfg.nb_lcores = rte_lcore_count() - 1;
        if (cfg.nb_lcores < 1)
                rte_exit(EXIT_FAILURE,
-                       "There should be at least one slave lcore.\n");
+                       "There should be at least one worker lcore.\n");
 
        if (copy_mode == COPY_MODE_IOAT_NUM)
                assign_rawdevs();
@@ -992,7 +992,7 @@ main(int argc, char **argv)
                assign_rings();
 
        start_forwarding_cores();
-       /* master core prints stats while other cores forward */
+       /* initial core prints stats while other cores forward */
        print_stats(argv[0]);
 
        /* force_quit is true when we get here */
diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 4afb97109fed..13b9f3ca0b66 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -1072,8 +1072,8 @@ main(int argc, char **argv)
        check_all_ports_link_status(enabled_port_mask);
 
        /* launch per-lcore init on every lcore */
-       rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       rte_eal_mp_remote_launch(main_loop, NULL, CALL_INITIAL);
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 494d7ee77641..01d89eef2f70 100644
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -1201,8 +1201,8 @@ main(int argc, char **argv)
        signal(SIGINT, signal_handler);
 
        /* launch per-lcore init on every lcore */
-       rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       rte_eal_mp_remote_launch(main_loop, NULL, CALL_INITIAL);
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 7e255c35a301..52dee9f68bcf 100644
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -801,8 +801,8 @@ main(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "Cannot build the multicast hash\n");
 
        /* launch per-lcore init on every lcore */
-       rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       rte_eal_mp_remote_launch(main_loop, NULL, CALL_INITIAL);
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
diff --git a/examples/kni/main.c b/examples/kni/main.c
index f5d12a5b8676..fde7db45e657 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -956,8 +956,7 @@ kni_alloc(uint16_t port_id)
                conf.mbuf_size = MAX_PACKET_SZ;
                /*
                 * The first KNI device associated to a port
-                * is the master, for multiple kernel thread
-                * environment.
+                * is special, for multiple kernel thread environment.
                 */
                if (i == 0) {
                        struct rte_kni_ops ops;
@@ -1105,8 +1104,8 @@ main(int argc, char** argv)
                        "Could not create link status thread!\n");
 
        /* Launch per-lcore function on every lcore */
-       rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(i) {
+       rte_eal_mp_remote_launch(main_loop, NULL, CALL_INITIAL);
+       RTE_LCORE_FOREACH_WORKER(i) {
                if (rte_eal_wait_lcore(i) < 0)
                        return -1;
        }
diff --git a/examples/link_status_interrupt/main.c 
b/examples/link_status_interrupt/main.c
index 9bbcadfcf8b9..e22c264fda71 100644
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -255,8 +255,8 @@ lsi_main_loop(void)
                                /* if timer has reached its timeout */
                                if (unlikely(timer_tsc >= (uint64_t) 
timer_period)) {
 
-                                       /* do this only on master core */
-                                       if (lcore_id == rte_get_master_lcore()) 
{
+                                       /* do this only on initial core */
+                                       if (lcore_id == 
rte_get_initial_lcore()) {
                                                print_stats();
                                                /* reset the timer */
                                                timer_tsc = 0;
@@ -735,8 +735,8 @@ main(int argc, char **argv)
        check_all_ports_link_status(nb_ports, lsi_enabled_port_mask);
 
        /* launch per-lcore init on every lcore */
-       rte_eal_mp_remote_launch(lsi_launch_one_lcore, NULL, CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       rte_eal_mp_remote_launch(lsi_launch_one_lcore, NULL, CALL_INITIAL);
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
diff --git a/examples/ntb/ntb_fwd.c b/examples/ntb/ntb_fwd.c
index eba8ebf9fab0..c60b6f3f944b 100644
--- a/examples/ntb/ntb_fwd.c
+++ b/examples/ntb/ntb_fwd.c
@@ -162,7 +162,7 @@ cmd_quit_parsed(__rte_unused void *parsed_result,
        uint32_t lcore_id;
 
        /* Stop transmission first. */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                conf = &fwd_lcore_conf[lcore_id];
 
                if (!conf->nb_stream)
@@ -668,7 +668,7 @@ assign_stream_to_lcores(void)
        uint8_t lcore_num, nb_extra;
 
        lcore_num = rte_lcore_count();
-       /* Exclude master core */
+       /* Exclude initial core */
        lcore_num--;
 
        nb_streams = (fwd_mode == IOFWD) ? num_queues * 2 : num_queues;
@@ -678,7 +678,7 @@ assign_stream_to_lcores(void)
        sm_id = 0;
        i = 0;
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                conf = &fwd_lcore_conf[lcore_id];
 
                if (i < nb_extra) {
@@ -697,7 +697,7 @@ assign_stream_to_lcores(void)
        }
 
        /* Print packet forwading config. */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                conf = &fwd_lcore_conf[lcore_id];
 
                if (!conf->nb_stream)
@@ -765,7 +765,7 @@ start_pkt_fwd(void)
        assign_stream_to_lcores();
        in_test = 1;
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                conf = &fwd_lcore_conf[lcore_id];
 
                if (!conf->nb_stream)
@@ -826,7 +826,7 @@ cmd_stop_parsed(__rte_unused void *parsed_result,
        struct ntb_fwd_lcore_conf *conf;
        uint32_t lcore_id;
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                conf = &fwd_lcore_conf[lcore_id];
 
                if (!conf->nb_stream)
@@ -1074,7 +1074,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        NULL,
 };
 
-/* prompt function, called from main on MASTER lcore */
+/* prompt function, called from main on initial lcore */
 static void
 prompt(void)
 {
diff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c
index b397b318e651..bcf3cbf89af2 100644
--- a/examples/packet_ordering/main.c
+++ b/examples/packet_ordering/main.c
@@ -348,10 +348,10 @@ print_stats(void)
 {
        uint16_t i;
        struct rte_eth_stats eth_stats;
-       unsigned int lcore_id, last_lcore_id, master_lcore_id, end_w_lcore_id;
+       unsigned int lcore_id, last_lcore_id, initial_lcore_id, end_w_lcore_id;
 
        last_lcore_id   = get_last_lcore_id();
-       master_lcore_id = rte_get_master_lcore();
+       initial_lcore_id = rte_get_initial_lcore();
        end_w_lcore_id  = get_previous_lcore_id(last_lcore_id);
 
        printf("\nRX thread stats:\n");
@@ -363,7 +363,7 @@ print_stats(void)
        for (lcore_id = 0; lcore_id <= end_w_lcore_id; lcore_id++) {
                if (insight_worker
                        && rte_lcore_is_enabled(lcore_id)
-                       && lcore_id != master_lcore_id) {
+                       && lcore_id != initial_lcore_id) {
                        printf("\nWorker thread stats on core [%u]:\n",
                                        lcore_id);
                        printf(" - Pkts deqd from workers ring:         
%"PRIu64"\n",
@@ -661,7 +661,7 @@ main(int argc, char **argv)
 {
        int ret;
        unsigned nb_ports;
-       unsigned int lcore_id, last_lcore_id, master_lcore_id;
+       unsigned int lcore_id, last_lcore_id, initial_lcore_id;
        uint16_t port_id;
        uint16_t nb_ports_available;
        struct worker_thread_args worker_args = {NULL, NULL};
@@ -748,32 +748,32 @@ main(int argc, char **argv)
        }
 
        last_lcore_id   = get_last_lcore_id();
-       master_lcore_id = rte_get_master_lcore();
+       initial_lcore_id = rte_get_initial_lcore();
 
        worker_args.ring_in  = rx_to_workers;
        worker_args.ring_out = workers_to_tx;
 
-       /* Start worker_thread() on all the available slave cores but the last 
1 */
+       /* Start worker_thread() on all the available worker cores but the last 
1 */
        for (lcore_id = 0; lcore_id <= get_previous_lcore_id(last_lcore_id); 
lcore_id++)
-               if (rte_lcore_is_enabled(lcore_id) && lcore_id != 
master_lcore_id)
+               if (rte_lcore_is_enabled(lcore_id) && lcore_id != 
initial_lcore_id)
                        rte_eal_remote_launch(worker_thread, (void 
*)&worker_args,
                                        lcore_id);
 
        if (disable_reorder) {
-               /* Start tx_thread() on the last slave core */
+               /* Start tx_thread() on the last worker core */
                rte_eal_remote_launch((lcore_function_t *)tx_thread, 
workers_to_tx,
                                last_lcore_id);
        } else {
                send_args.ring_in = workers_to_tx;
-               /* Start send_thread() on the last slave core */
+               /* Start send_thread() on the last worker core */
                rte_eal_remote_launch((lcore_function_t *)send_thread,
                                (void *)&send_args, last_lcore_id);
        }
 
-       /* Start rx_thread() on the master core */
+       /* Start rx_thread() on the initial core */
        rx_thread(rx_to_workers);
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
diff --git a/examples/rxtx_callbacks/main.c b/examples/rxtx_callbacks/main.c
index 54d124b00bc9..562abb87d7ff 100644
--- a/examples/rxtx_callbacks/main.c
+++ b/examples/rxtx_callbacks/main.c
@@ -302,7 +302,7 @@ main(int argc, char *argv[])
                printf("\nWARNING: Too much enabled lcores - "
                        "App uses only 1 lcore\n");
 
-       /* call lcore_main on master core only */
+       /* call lcore_main on initial core only */
        lcore_main();
        return 0;
 }
diff --git a/examples/server_node_efd/server/main.c 
b/examples/server_node_efd/server/main.c
index 05f961cff5d0..912dcd06c70f 100644
--- a/examples/server_node_efd/server/main.c
+++ b/examples/server_node_efd/server/main.c
@@ -95,7 +95,7 @@ get_printable_mac_addr(uint16_t port)
 /*
  * This function displays the recorded statistics for each port
  * and for each node. It uses ANSI terminal codes to clear
- * screen when called. It is called from a single non-master
+ * screen when called. It is called from a single worker
  * thread in the server process, when the process is run with more
  * than one lcore enabled.
  */
@@ -168,7 +168,7 @@ do_stats_display(void)
 }
 
 /*
- * The function called from each non-master lcore used by the process.
+ * The function called from each worker lcore used by the process.
  * The test_and_set function is used to randomly pick a single lcore on which
  * the code to display the statistics will run. Otherwise, the code just
  * repeatedly sleeps.
@@ -290,7 +290,7 @@ process_packets(uint32_t port_num __rte_unused, struct 
rte_mbuf *pkts[],
 }
 
 /*
- * Function called by the master lcore of the DPDK process.
+ * Function called by the initial lcore of the DPDK process.
  */
 static void
 do_packet_forwarding(void)
@@ -330,8 +330,8 @@ main(int argc, char *argv[])
        /* clear statistics */
        clear_stats();
 
-       /* put all other cores to sleep bar master */
-       rte_eal_mp_remote_launch(sleep_lcore, NULL, SKIP_MASTER);
+       /* put all other cores to sleep  */
+       rte_eal_mp_remote_launch(sleep_lcore, NULL, SKIP_INITIAL);
 
        do_packet_forwarding();
        return 0;
diff --git a/examples/skeleton/basicfwd.c b/examples/skeleton/basicfwd.c
index 72ba85fa1fe5..3062ac2f596c 100644
--- a/examples/skeleton/basicfwd.c
+++ b/examples/skeleton/basicfwd.c
@@ -202,7 +202,7 @@ main(int argc, char *argv[])
        if (rte_lcore_count() > 1)
                printf("\nWARNING: Too many lcores enabled. Only 1 used.\n");
 
-       /* Call lcore_main on the master core only. */
+       /* Call lcore_main on the initial core only. */
        lcore_main();
 
        return 0;
diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c
index b9fffca020a9..55fb3335538f 100644
--- a/examples/tep_termination/main.c
+++ b/examples/tep_termination/main.c
@@ -838,7 +838,7 @@ init_data_ll(void)
 {
        int lcore;
 
-       RTE_LCORE_FOREACH_SLAVE(lcore) {
+       RTE_LCORE_FOREACH_WORKER(lcore) {
                lcore_info[lcore].lcore_ll =
                        malloc(sizeof(struct lcore_ll_info));
                if (lcore_info[lcore].lcore_ll == NULL) {
@@ -930,7 +930,7 @@ destroy_device(int vid)
        rm_data_ll_entry(&ll_root_used, ll_main_dev_cur, ll_main_dev_last);
 
        /* Set the dev_removal_flag on each lcore. */
-       RTE_LCORE_FOREACH_SLAVE(lcore) {
+       RTE_LCORE_FOREACH_WORKER(lcore) {
                lcore_info[lcore].lcore_ll->dev_removal_flag =
                        REQUEST_DEV_REMOVAL;
        }
@@ -941,7 +941,7 @@ destroy_device(int vid)
         * the device removed from the linked lists and that the devices
         * are no longer in use.
         */
-       RTE_LCORE_FOREACH_SLAVE(lcore) {
+       RTE_LCORE_FOREACH_WORKER(lcore) {
                while (lcore_info[lcore].lcore_ll->dev_removal_flag
                        != ACK_DEV_REMOVAL)
                        rte_pause();
@@ -1001,7 +1001,7 @@ new_device(int vid)
        vdev->remove = 0;
 
        /* Find a suitable lcore to add the device. */
-       RTE_LCORE_FOREACH_SLAVE(lcore) {
+       RTE_LCORE_FOREACH_WORKER(lcore) {
                if (lcore_info[lcore].lcore_ll->device_num < device_num_min) {
                        device_num_min = lcore_info[lcore].lcore_ll->device_num;
                        core_add = lcore;
@@ -1207,7 +1207,7 @@ main(int argc, char *argv[])
        }
 
        /* Launch all data cores. */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                rte_eal_remote_launch(switch_worker,
                        mbuf_pool, lcore_id);
        }
@@ -1231,7 +1231,7 @@ main(int argc, char *argv[])
                        "failed to start vhost driver.\n");
        }
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id)
+       RTE_LCORE_FOREACH_WORKER(lcore_id)
                rte_eal_wait_lcore(lcore_id);
 
        return 0;
diff --git a/examples/timer/main.c b/examples/timer/main.c
index 0259022f104e..50a0f60951e2 100644
--- a/examples/timer/main.c
+++ b/examples/timer/main.c
@@ -100,7 +100,7 @@ main(int argc, char **argv)
        rte_timer_init(&timer0);
        rte_timer_init(&timer1);
 
-       /* load timer0, every second, on master lcore, reloaded automatically */
+       /* load timer0, every second, on initial lcore, reloaded automatically 
*/
        hz = rte_get_timer_hz();
        lcore_id = rte_lcore_id();
        rte_timer_reset(&timer0, hz, PERIODICAL, lcore_id, timer0_cb, NULL);
@@ -109,12 +109,12 @@ main(int argc, char **argv)
        lcore_id = rte_get_next_lcore(lcore_id, 0, 1);
        rte_timer_reset(&timer1, hz/3, SINGLE, lcore_id, timer1_cb, NULL);
 
-       /* call lcore_mainloop() on every slave lcore */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       /* call lcore_mainloop() on every worker lcore */
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                rte_eal_remote_launch(lcore_mainloop, NULL, lcore_id);
        }
 
-       /* call it on master lcore too */
+       /* call it on initial lcore too */
        (void) lcore_mainloop(NULL);
 
        return 0;
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 312829e8b930..012aa6706ca1 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -1205,7 +1205,7 @@ destroy_device(int vid)
 
 
        /* Set the dev_removal_flag on each lcore. */
-       RTE_LCORE_FOREACH_SLAVE(lcore)
+       RTE_LCORE_FOREACH_WORKER(lcore)
                lcore_info[lcore].dev_removal_flag = REQUEST_DEV_REMOVAL;
 
        /*
@@ -1213,7 +1213,7 @@ destroy_device(int vid)
         * we can be sure that they can no longer access the device removed
         * from the linked lists and that the devices are no longer in use.
         */
-       RTE_LCORE_FOREACH_SLAVE(lcore) {
+       RTE_LCORE_FOREACH_WORKER(lcore) {
                while (lcore_info[lcore].dev_removal_flag != ACK_DEV_REMOVAL)
                        rte_pause();
        }
@@ -1258,7 +1258,7 @@ new_device(int vid)
        vdev->remove = 0;
 
        /* Find a suitable lcore to add the device. */
-       RTE_LCORE_FOREACH_SLAVE(lcore) {
+       RTE_LCORE_FOREACH_WORKER(lcore) {
                if (lcore_info[lcore].device_num < device_num_min) {
                        device_num_min = lcore_info[lcore].device_num;
                        core_add = lcore;
@@ -1507,7 +1507,7 @@ main(int argc, char *argv[])
        }
 
        /* Launch all data cores. */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id)
+       RTE_LCORE_FOREACH_WORKER(lcore_id)
                rte_eal_remote_launch(switch_worker, NULL, lcore_id);
 
        if (client_mode)
@@ -1568,7 +1568,7 @@ main(int argc, char *argv[])
                }
        }
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id)
+       RTE_LCORE_FOREACH_WORKER(lcore_id)
                rte_eal_wait_lcore(lcore_id);
 
        return 0;
diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index d08826c868f8..25fb6fd62f1b 100644
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -656,8 +656,8 @@ main(int argc, char *argv[])
        }
 
        /* call lcore_main() on every lcore */
-       rte_eal_mp_remote_launch(lcore_main, NULL, CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       rte_eal_mp_remote_launch(lcore_main, NULL, CALL_INITIAL);
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index f417b2fd9b91..e1c8ed0c381a 100644
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -702,12 +702,12 @@ main(int argc, char *argv[])
                        rte_exit(EXIT_FAILURE, "Cannot initialize network 
ports\n");
        }
 
-       /* call lcore_main() on every slave lcore */
+       /* call lcore_main() on every worker lcore */
        i = 0;
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                rte_eal_remote_launch(lcore_main, (void*)i++, lcore_id);
        }
-       /* call on master too */
+       /* call on initial too */
        (void) lcore_main((void*)i);
 
        return 0;
-- 
2.26.2

Reply via email to