[dpdk-dev] [PATCH v3 09/17] app/test-pmd: replace master lcore with main lcore

[Stephen Hemminger]

Replace wording around main lcore.

Acked-by: Anatoly Burakov <anatoly.bura...@intel.com>
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
 app/test-pmd/cmdline.c    | 2 +-
 app/test-pmd/config.c     | 4 ++--
 app/test-pmd/parameters.c | 2 +-
 app/test-pmd/testpmd.c    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0a6ed85f3395..966dbb41c667 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -19709,7 +19709,7 @@ cmdline_read_from_file(const char *filename)
        printf("Read CLI commands from %s\n", filename);
 }
 
-/* prompt function, called from main on MASTER lcore */
+/* prompt function, called from main on MAIN lcore */
 void
 prompt(void)
 {
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 30bee332481a..1e841f191702 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2683,9 +2683,9 @@ set_fwd_lcores_list(unsigned int *lcorelist, unsigned int 
nb_lc)
                        printf("lcore %u not enabled\n", lcore_cpuid);
                        return -1;
                }
-               if (lcore_cpuid == rte_get_master_lcore()) {
+               if (lcore_cpuid == rte_get_main_lcore()) {
                        printf("lcore %u cannot be masked on for running "
-                              "packet forwarding, which is the master lcore "
+                              "packet forwarding, which is the main lcore "
                               "and reserved for command line parsing only\n",
                               lcore_cpuid);
                        return -1;
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 7cb0e3d6ec0a..6d10debc317d 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -88,7 +88,7 @@ usage(char* progname)
        printf("  --nb-ports=N: set the number of forwarding ports "
               "(1 <= N <= %d).\n", nb_ports);
        printf("  --coremask=COREMASK: hexadecimal bitmask of cores running "
-              "the packet forwarding test. The master lcore is reserved for "
+              "the packet forwarding test. The main lcore is reserved for "
               "command line parsing only, and cannot be masked on for "
               "packet forwarding.\n");
        printf("  --portmask=PORTMASK: hexadecimal bitmask of ports used "
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 7842c3b78120..165e35f7e8a4 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -83,7 +83,7 @@
 uint16_t verbose_level = 0; /**< Silent by default. */
 int testpmd_logtype; /**< Log type for testpmd logs */
 
-/* use master core for command line ? */
+/* use main core for command line ? */
 uint8_t interactive = 0;
 uint8_t auto_start = 0;
 uint8_t tx_first;
@@ -556,7 +556,7 @@ set_default_fwd_lcores_config(void)
                        }
                        socket_ids[num_sockets++] = sock_num;
                }
-               if (i == rte_get_master_lcore())
+               if (i == rte_get_main_lcore())
                        continue;
                fwd_lcores_cpuids[nb_lc++] = i;
        }
-- 
2.27.0