patch 'buildtools/cmdline: fix generated code for IP addresses' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Tue Mar 5 10:45:42 CET 2024


Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/31/24. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=3cedd8b9e4617682700bc3a712edfb19964cd302

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 3cedd8b9e4617682700bc3a712edfb19964cd302 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 5 Dec 2023 11:31:04 +0000
Subject: [PATCH] buildtools/cmdline: fix generated code for IP addresses
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit a78b8f11dc1093cd1dc25bb4bcdde63b5dccb4ac ]

The C code generated for the tokens for matching IP addresses in
commandlines was missing the "static" prefix present in the output for
the other data-types.

Fixes: 37666691e9ed ("buildtools: add a tool to generate cmdline boilerplate")

Reported-by: Sunil Kumar Kori <skori at marvell.com>
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Sunil Kumar Kori <skori at marvell.com>
---
 buildtools/dpdk-cmdline-gen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildtools/dpdk-cmdline-gen.py b/buildtools/dpdk-cmdline-gen.py
index 49b03bee4a..bf1253d949 100755
--- a/buildtools/dpdk-cmdline-gen.py
+++ b/buildtools/dpdk-cmdline-gen.py
@@ -71,7 +71,7 @@ def process_command(lineno, tokens, comment):
         elif t_type in ["IP", "IP_ADDR", "IPADDR"]:
             result_struct.append(f"\tcmdline_ipaddr_t {t_name};")
             initializers.append(
-                f"cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
+                f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
                 f"\tTOKEN_IPV4_INITIALIZER(struct cmd_{name}_result, {t_name});"
             )
         elif t_type.startswith("(") and t_type.endswith(")"):
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 17:39:31.152339106 +0800
+++ 0001-buildtools-cmdline-fix-generated-code-for-IP-address.patch	2024-03-05 17:39:30.633566488 +0800
@@ -1 +1 @@
-From a78b8f11dc1093cd1dc25bb4bcdde63b5dccb4ac Mon Sep 17 00:00:00 2001
+From 3cedd8b9e4617682700bc3a712edfb19964cd302 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit a78b8f11dc1093cd1dc25bb4bcdde63b5dccb4ac ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list