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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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/21/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.

Thanks.

Luca Boccassi

---
>From 51482b3b67bc85c27e2d48b465fa087982410c01 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_power/rte_power_acpi_cpufreq.c | 4 ++--
 lib/librte_vhost/socket.c                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_power/rte_power_acpi_cpufreq.c b/lib/librte_power/rte_power_acpi_cpufreq.c
index 9a2fa81d28..3ce5a0d890 100644
--- a/lib/librte_power/rte_power_acpi_cpufreq.c
+++ b/lib/librte_power/rte_power_acpi_cpufreq.c
@@ -57,7 +57,7 @@
 
 #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; \
 		} \
 } while (0)
@@ -136,7 +136,7 @@ set_freq_internal(struct rte_power_info *pi, uint32_t idx)
 	if (idx == pi->curr_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) {
 		RTE_LOG(ERR, POWER, "Fail to set file position indicator to 0 "
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index c035b6ab5e..1933f47f1a 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -150,7 +150,7 @@ 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.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:31.149061719 +0000
+++ 0121-lib-fix-log-typos.patch	2019-12-19 14:32:26.317302029 +0000
@@ -1,8 +1,10 @@
-From 0411d61fa96093e6c3a2a817ca68ca7ac3019a1d Mon Sep 17 00:00:00 2001
+From 51482b3b67bc85c27e2d48b465fa087982410c01 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")
@@ -11,67 +13,19 @@
 Fixes: 445c6528b55f ("power: common interface for guest and host")
 Fixes: e6c6dc0f96c8 ("power: add p-state driver compatibility")
 Fixes: 8f972312b8f4 ("vhost: support vhost-user")
-Cc: stable at dpdk.org
 
 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_eal/linux/eal/eal_vfio.c     | 4 ++--
- lib/librte_power/power_acpi_cpufreq.c   | 4 ++--
- lib/librte_power/power_pstate_cpufreq.c | 6 +++---
- lib/librte_vhost/socket.c               | 2 +-
- 5 files changed, 10 insertions(+), 10 deletions(-)
+ lib/librte_power/rte_power_acpi_cpufreq.c | 4 ++--
+ lib/librte_vhost/socket.c                 | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
-index cbe8d10fcf..935e8fefeb 100644
---- a/lib/librte_eal/common/eal_common_proc.c
-+++ b/lib/librte_eal/common/eal_common_proc.c
-@@ -283,7 +283,7 @@ 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;
- 	}
- 
-@@ -1071,7 +1071,7 @@ 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_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c
-index 28e10cdc49..95f615c2e3 100644
---- a/lib/librte_eal/linux/eal/eal_vfio.c
-+++ b/lib/librte_eal/linux/eal/eal_vfio.c
-@@ -1294,7 +1294,7 @@ 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 {
- 				RTE_LOG(ERR, EAL,
-@@ -1379,7 +1379,7 @@ 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 {
- 				RTE_LOG(ERR, EAL,
-diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c
-index 7c386f891e..22989244ab 100644
---- a/lib/librte_power/power_acpi_cpufreq.c
-+++ b/lib/librte_power/power_acpi_cpufreq.c
-@@ -30,7 +30,7 @@
+diff --git a/lib/librte_power/rte_power_acpi_cpufreq.c b/lib/librte_power/rte_power_acpi_cpufreq.c
+index 9a2fa81d28..3ce5a0d890 100644
+--- a/lib/librte_power/rte_power_acpi_cpufreq.c
++++ b/lib/librte_power/rte_power_acpi_cpufreq.c
+@@ -57,7 +57,7 @@
  
  #define FOPEN_OR_ERR_RET(f, retval) do { \
  		if ((f) == NULL) { \
@@ -80,7 +34,7 @@
  			return retval; \
  		} \
  } while (0)
-@@ -109,7 +109,7 @@ set_freq_internal(struct rte_power_info *pi, uint32_t idx)
+@@ -136,7 +136,7 @@ set_freq_internal(struct rte_power_info *pi, uint32_t idx)
  	if (idx == pi->curr_idx)
  		return 0;
  
@@ -89,42 +43,11 @@
  			idx, pi->freqs[idx], pi->lcore_id);
  	if (fseek(pi->f, 0, SEEK_SET) < 0) {
  		RTE_LOG(ERR, POWER, "Fail to set file position indicator to 0 "
-diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c
-index ecbcb3ac99..8f095e0ab1 100644
---- a/lib/librte_power/power_pstate_cpufreq.c
-+++ b/lib/librte_power/power_pstate_cpufreq.c
-@@ -33,7 +33,7 @@
- 
- #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; \
- 		} \
- } while (0)
-@@ -287,7 +287,7 @@ set_freq_internal(struct pstate_power_info *pi, uint32_t idx)
- 			return -1;
- 		}
- 
--		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);
- 
- 		fflush(pi->f_cur_min);
-@@ -310,7 +310,7 @@ set_freq_internal(struct pstate_power_info *pi, uint32_t idx)
- 			return -1;
- 		}
- 
--		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);
- 
- 		fflush(pi->f_cur_max);
 diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
-index a34bc7f9a3..ebb2ff6c28 100644
+index c035b6ab5e..1933f47f1a 100644
 --- a/lib/librte_vhost/socket.c
 +++ b/lib/librte_vhost/socket.c
-@@ -132,7 +132,7 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
+@@ -150,7 +150,7 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
  	}
  
  	if (msgh.msg_flags & (MSG_TRUNC | MSG_CTRUNC)) {