67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From f05ce4c32a5c4121f41a69fa8b78c0a6a69e29d8 Mon Sep 17 00:00:00 2001
|
|
From: yangchen <yangchen145@huawei.com>
|
|
Date: Wed, 20 Nov 2024 11:42:00 +0800
|
|
Subject: [PATCH] cfg: show dpdk args after dpdk_adjust_args
|
|
|
|
---
|
|
src/lstack/core/lstack_cfg.c | 19 ++++++++++++-------
|
|
1 file changed, 12 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
|
|
index 2a3f1af..72dbb18 100644
|
|
--- a/src/lstack/core/lstack_cfg.c
|
|
+++ b/src/lstack/core/lstack_cfg.c
|
|
@@ -905,7 +905,7 @@ static void dpdk_fill_socket_mem(void)
|
|
}
|
|
}
|
|
|
|
-static void dpdk_add_args(void)
|
|
+static void dpdk_adjust_args(void)
|
|
{
|
|
int idx;
|
|
uint16_t lcore_id;
|
|
@@ -936,6 +936,15 @@ static void dpdk_add_args(void)
|
|
}
|
|
}
|
|
|
|
+static void dpdk_show_args(void)
|
|
+{
|
|
+ (void)fprintf(stderr, "dpdk argv: ");
|
|
+ for (uint32_t i = 1; i < g_config_params.dpdk_argc; i++) {
|
|
+ (void)fprintf(stderr, "%s ", g_config_params.dpdk_argv[i]);
|
|
+ }
|
|
+ (void)fprintf(stderr, "\n");
|
|
+}
|
|
+
|
|
static int32_t parse_dpdk_args(void)
|
|
{
|
|
int32_t i;
|
|
@@ -957,8 +966,6 @@ static int32_t parse_dpdk_args(void)
|
|
if (!g_config_params.dpdk_argv)
|
|
return -EINVAL;
|
|
|
|
- (void)fprintf(stderr, "dpdk argv: ");
|
|
-
|
|
g_config_params.dpdk_argv[0] = strdup("lstack");
|
|
if (!g_config_params.dpdk_argv[0]) {
|
|
goto free_dpdk_args;
|
|
@@ -981,13 +988,11 @@ static int32_t parse_dpdk_args(void)
|
|
if (strcmp(p, secondary) == 0) {
|
|
global_params->is_primary = 0;
|
|
}
|
|
-
|
|
- (void)fprintf(stderr, "%s ", g_config_params.dpdk_argv[start_index + i]);
|
|
}
|
|
- (void)fprintf(stderr, "\n");
|
|
g_config_params.dpdk_argc++;
|
|
|
|
- dpdk_add_args();
|
|
+ dpdk_adjust_args();
|
|
+ dpdk_show_args();
|
|
|
|
if (turn_args_to_config(g_config_params.dpdk_argc, g_config_params.dpdk_argv))
|
|
goto free_dpdk_args;
|
|
--
|
|
2.33.0
|
|
|