patch 'vhost: add some trailing newline in log messages' has been queued to stable release 21.11.2

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Jul 6 22:34:50 CEST 2022


Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/08/22. 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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/1f963ee7a31061c864884f72b77a611a0f3e6507

Thanks.

Luca Boccassi

---
>From 1f963ee7a31061c864884f72b77a611a0f3e6507 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 1 Jul 2022 09:55:08 +0200
Subject: [PATCH] vhost: add some trailing newline in log messages

[ upstream commit 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 ]

VHOST_LOG_* macros don't append a newline.
Add missing ones.

Fixes: e623e0c6d8a5 ("vhost: add reconnect ability")
Fixes: af1475918124 ("vhost: introduce API to start a specific driver")
Fixes: 2dfeebe26546 ("vhost: check return of mutex initialization")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
---
 lib/vhost/socket.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index 82963c1e6d..33f54a779b 100644
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -501,7 +501,7 @@ vhost_user_reconnect_init(void)
 
 	ret = pthread_mutex_init(&reconn_list.mutex, NULL);
 	if (ret < 0) {
-		VHOST_LOG_CONFIG(ERR, "failed to initialize mutex");
+		VHOST_LOG_CONFIG(ERR, "failed to initialize mutex\n");
 		return ret;
 	}
 	TAILQ_INIT(&reconn_list.head);
@@ -509,10 +509,10 @@ vhost_user_reconnect_init(void)
 	ret = rte_ctrl_thread_create(&reconn_tid, "vhost_reconn", NULL,
 			     vhost_user_client_reconnect, NULL);
 	if (ret != 0) {
-		VHOST_LOG_CONFIG(ERR, "failed to create reconnect thread");
+		VHOST_LOG_CONFIG(ERR, "failed to create reconnect thread\n");
 		if (pthread_mutex_destroy(&reconn_list.mutex)) {
 			VHOST_LOG_CONFIG(ERR,
-				"failed to destroy reconnect mutex");
+				"failed to destroy reconnect mutex\n");
 		}
 	}
 
@@ -1147,7 +1147,7 @@ rte_vhost_driver_start(const char *path)
 			&vhost_user.fdset);
 		if (ret != 0) {
 			VHOST_LOG_CONFIG(ERR,
-				"failed to create fdset handling thread");
+				"failed to create fdset handling thread\n");
 
 			fdset_pipe_uninit(&vhost_user.fdset);
 			return -1;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-06 21:07:54.080253711 +0100
+++ 0015-vhost-add-some-trailing-newline-in-log-messages.patch	2022-07-06 21:07:53.543518707 +0100
@@ -1 +1 @@
-From 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 Mon Sep 17 00:00:00 2001
+From 1f963ee7a31061c864884f72b77a611a0f3e6507 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- lib/vhost/socket.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ lib/vhost/socket.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
@@ -21 +22 @@
-index 7a0f63af14..24d60ca149 100644
+index 82963c1e6d..33f54a779b 100644
@@ -24 +25 @@
-@@ -499,7 +499,7 @@ vhost_user_reconnect_init(void)
+@@ -501,7 +501,7 @@ vhost_user_reconnect_init(void)
@@ -28,2 +29,2 @@
--		VHOST_LOG_CONFIG(ERR, "%s: failed to initialize mutex", __func__);
-+		VHOST_LOG_CONFIG(ERR, "%s: failed to initialize mutex\n", __func__);
+-		VHOST_LOG_CONFIG(ERR, "failed to initialize mutex");
++		VHOST_LOG_CONFIG(ERR, "failed to initialize mutex\n");
@@ -33 +34 @@
-@@ -507,9 +507,9 @@ vhost_user_reconnect_init(void)
+@@ -509,10 +509,10 @@ vhost_user_reconnect_init(void)
@@ -39,3 +40,5 @@
- 		if (pthread_mutex_destroy(&reconn_list.mutex))
--			VHOST_LOG_CONFIG(ERR, "%s: failed to destroy reconnect mutex", __func__);
-+			VHOST_LOG_CONFIG(ERR, "%s: failed to destroy reconnect mutex\n", __func__);
+ 		if (pthread_mutex_destroy(&reconn_list.mutex)) {
+ 			VHOST_LOG_CONFIG(ERR,
+-				"failed to destroy reconnect mutex");
++				"failed to destroy reconnect mutex\n");
+ 		}
@@ -44,3 +47 @@
- 	return ret;
-@@ -1170,8 +1170,8 @@ rte_vhost_driver_start(const char *path)
- 			"vhost-events", NULL, fdset_event_dispatch,
+@@ -1147,7 +1147,7 @@ rte_vhost_driver_start(const char *path)
@@ -49,4 +50,4 @@
--			VHOST_LOG_CONFIG(ERR, "(%s) failed to create fdset handling thread", path);
--
-+			VHOST_LOG_CONFIG(ERR, "(%s) failed to create fdset handling thread\n",
-+				path);
+ 			VHOST_LOG_CONFIG(ERR,
+-				"failed to create fdset handling thread");
++				"failed to create fdset handling thread\n");
+ 
@@ -55 +55,0 @@
- 		}


More information about the stable mailing list