patch 'buildtools/cmdline: fix IP address initializer' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Tue Mar 5 10:45:43 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=2c512fe65af23d7d217d8bc5c30617962dfab289

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2c512fe65af23d7d217d8bc5c30617962dfab289 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 5 Dec 2023 14:51:08 +0000
Subject: [PATCH] buildtools/cmdline: fix IP address initializer
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 7cd7850a888e5aa112062711107d9417570ca719 ]

The IP address type should be generic for both IPv4 and IPv6 and so use
the cmdline lib's TOKEN_IPADDR_INITIALIZER rather than
TOKEN_IPV4_INITIALIZER.

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

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 bf1253d949..30d32ac183 100755
--- a/buildtools/dpdk-cmdline-gen.py
+++ b/buildtools/dpdk-cmdline-gen.py
@@ -72,7 +72,7 @@ def process_command(lineno, tokens, comment):
             result_struct.append(f"\tcmdline_ipaddr_t {t_name};")
             initializers.append(
                 f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
-                f"\tTOKEN_IPV4_INITIALIZER(struct cmd_{name}_result, {t_name});"
+                f"\tTOKEN_IPADDR_INITIALIZER(struct cmd_{name}_result, {t_name});"
             )
         elif t_type.startswith("(") and t_type.endswith(")"):
             result_struct.append(f"\tcmdline_fixed_string_t {t_name};")
--
2.34.1

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


More information about the stable mailing list