[dpdk-stable] patch 'lib: fix log typos' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Wed Dec 11 22:26:23 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/17/19. 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-queue

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

Thanks.

Kevin.

---
>From e62ce0a96ac0121554d84ffbdd9f5baea17c7925 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor at redhat.com>
Date: Wed, 13 Nov 2019 16:10:14 +0000
Subject: [PATCH] lib: fix log typos

[ upstream commit 0411d61fa96093e6c3a2a817ca68ca7ac3019a1d ]

Fix these as they are user visible. Found with codespell.

Fixes: bacaa2754017 ("eal: add channel for multi-process communication")
Fixes: f05e26051c15 ("eal: add IPC asynchronous request")
Fixes: 0cbce3a167f1 ("vfio: skip DMA map failure if already mapped")
Fixes: 445c6528b55f ("power: common interface for guest and host")
Fixes: e6c6dc0f96c8 ("power: add p-state driver compatibility")
Fixes: 8f972312b8f4 ("vhost: support vhost-user")

Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/common/eal_common_proc.c | 4 ++--
 lib/librte_power/power_acpi_cpufreq.c   | 4 ++--
 lib/librte_vhost/socket.c               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index 852e52e02..35e574393 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -273,5 +273,5 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
 
 	if (msglen != buflen || (msgh.msg_flags & (MSG_TRUNC | MSG_CTRUNC))) {
-		RTE_LOG(ERR, EAL, "truncted msg\n");
+		RTE_LOG(ERR, EAL, "truncated msg\n");
 		return -1;
 	}
@@ -1052,5 +1052,5 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
 
 	if (gettimeofday(&now, NULL) < 0) {
-		RTE_LOG(ERR, EAL, "Faile to get current time\n");
+		RTE_LOG(ERR, EAL, "Failed to get current time\n");
 		rte_errno = errno;
 		return -1;
diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c
index f7d3f9ca9..6051e02d9 100644
--- a/lib/librte_power/power_acpi_cpufreq.c
+++ b/lib/librte_power/power_acpi_cpufreq.c
@@ -30,5 +30,5 @@
 #define FOPEN_OR_ERR_RET(f, retval) do { \
 		if ((f) == NULL) { \
-			RTE_LOG(ERR, POWER, "File not openned\n"); \
+			RTE_LOG(ERR, POWER, "File not opened\n"); \
 			return retval; \
 		} \
@@ -109,5 +109,5 @@ set_freq_internal(struct rte_power_info *pi, uint32_t idx)
 		return 0;
 
-	POWER_DEBUG_TRACE("Freqency[%u] %u to be set for lcore %u\n",
+	POWER_DEBUG_TRACE("Frequency[%u] %u to be set for lcore %u\n",
 			idx, pi->freqs[idx], pi->lcore_id);
 	if (fseek(pi->f, 0, SEEK_SET) < 0) {
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 9a674956f..5e422335c 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -131,5 +131,5 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
 
 	if (msgh.msg_flags & (MSG_TRUNC | MSG_CTRUNC)) {
-		RTE_LOG(ERR, VHOST_CONFIG, "truncted msg\n");
+		RTE_LOG(ERR, VHOST_CONFIG, "truncated msg\n");
 		return -1;
 	}
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:15.196356929 +0000
+++ 0031-lib-fix-log-typos.patch	2019-12-11 21:24:12.660651362 +0000
@@ -1 +1 @@
-From 0411d61fa96093e6c3a2a817ca68ca7ac3019a1d Mon Sep 17 00:00:00 2001
+From e62ce0a96ac0121554d84ffbdd9f5baea17c7925 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0411d61fa96093e6c3a2a817ca68ca7ac3019a1d ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -20 +20,0 @@
- lib/librte_eal/linux/eal/eal_vfio.c     | 4 ++--
@@ -22 +21,0 @@
- lib/librte_power/power_pstate_cpufreq.c | 6 +++---
@@ -24 +23 @@
- 5 files changed, 10 insertions(+), 10 deletions(-)
+ 3 files changed, 5 insertions(+), 5 deletions(-)
@@ -27 +26 @@
-index cbe8d10fc..935e8fefe 100644
+index 852e52e02..35e574393 100644
@@ -30 +29 @@
-@@ -284,5 +284,5 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
+@@ -273,5 +273,5 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
@@ -37 +36 @@
-@@ -1072,5 +1072,5 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
+@@ -1052,5 +1052,5 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
@@ -44,18 +42,0 @@
-diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c
-index 28e10cdc4..95f615c2e 100644
---- a/lib/librte_eal/linux/eal/eal_vfio.c
-+++ b/lib/librte_eal/linux/eal/eal_vfio.c
-@@ -1295,5 +1295,5 @@ vfio_type1_dma_mem_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,
- 			if (errno == EEXIST) {
- 				RTE_LOG(DEBUG, EAL,
--					" Memory segment is allready mapped,"
-+					" Memory segment is already mapped,"
- 					" skipping");
- 			} else {
-@@ -1380,5 +1380,5 @@ vfio_spapr_dma_do_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,
- 			if (errno == EBUSY) {
- 				RTE_LOG(DEBUG, EAL,
--					" Memory segment is allready mapped,"
-+					" Memory segment is already mapped,"
- 					" skipping");
- 			} else {
@@ -63 +44 @@
-index 7c386f891..22989244a 100644
+index f7d3f9ca9..6051e02d9 100644
@@ -66 +47 @@
-@@ -31,5 +31,5 @@
+@@ -30,5 +30,5 @@
@@ -73 +54 @@
-@@ -110,5 +110,5 @@ set_freq_internal(struct rte_power_info *pi, uint32_t idx)
+@@ -109,5 +109,5 @@ set_freq_internal(struct rte_power_info *pi, uint32_t idx)
@@ -80,25 +60,0 @@
-diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c
-index ecbcb3ac9..8f095e0ab 100644
---- a/lib/librte_power/power_pstate_cpufreq.c
-+++ b/lib/librte_power/power_pstate_cpufreq.c
-@@ -34,5 +34,5 @@
- #define FOPEN_OR_ERR_RET(f, retval) do { \
- 		if ((f) == NULL) { \
--			RTE_LOG(ERR, POWER, "File not openned\n"); \
-+			RTE_LOG(ERR, POWER, "File not opened\n"); \
- 			return retval; \
- 		} \
-@@ -288,5 +288,5 @@ set_freq_internal(struct pstate_power_info *pi, uint32_t idx)
- 		}
- 
--		POWER_DEBUG_TRACE("Freqency '%u' to be set for lcore %u\n",
-+		POWER_DEBUG_TRACE("Frequency '%u' to be set for lcore %u\n",
- 				  target_freq, pi->lcore_id);
- 
-@@ -311,5 +311,5 @@ set_freq_internal(struct pstate_power_info *pi, uint32_t idx)
- 		}
- 
--		POWER_DEBUG_TRACE("Freqency '%u' to be set for lcore %u\n",
-+		POWER_DEBUG_TRACE("Frequency '%u' to be set for lcore %u\n",
- 				  target_freq, pi->lcore_id);
- 
@@ -106 +62 @@
-index a34bc7f9a..ebb2ff6c2 100644
+index 9a674956f..5e422335c 100644
@@ -109 +65 @@
-@@ -133,5 +133,5 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
+@@ -131,5 +131,5 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,



More information about the stable mailing list