Skip to content

Commit

Permalink
lib: add newline in logs
Browse files Browse the repository at this point in the history 
[ upstream commit 8e2407e46782d43f9a1d83d72e279a4f86389bcd ]

Fix places leading to a log message not terminated with a newline.

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
  • Loading branch information
@david-marchand @bluca
david-marchand authored and bluca committed Feb 22, 2024
1 parent 88ba671 commit 31a09fa
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion lib/eal/common/eal_common_options.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2142,7 +2142,7 @@ rte_vect_set_max_simd_bitwidth(uint16_t bitwidth)
struct internal_config *internal_conf =
eal_get_internal_configuration();
if (internal_conf->max_simd_bitwidth.forced) {
RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - user runtime override enabled");
RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - user runtime override enabled\n");
return -EPERM;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/eal/linux/eal_hugepage_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ inspect_hugedir_cb(const struct walk_hugedir_data *whd)
struct stat st;

if (fstat(whd->file_fd, &st) < 0)
RTE_LOG(DEBUG, EAL, "%s(): stat(\"%s\") failed: %s",
RTE_LOG(DEBUG, EAL, "%s(): stat(\"%s\") failed: %s\n",
__func__, whd->file_name, strerror(errno));
else
(*total_size) += st.st_size;
Expand Down
2 changes: 1 addition & 1 deletion lib/eal/linux/eal_interrupts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,7 @@ rte_intr_efd_enable(struct rte_intr_handle *intr_handle, uint32_t nb_efd)
/* only check, initialization would be done in vdev driver.*/
if ((uint64_t)rte_intr_efd_counter_size_get(intr_handle) >
sizeof(union rte_intr_read_buffer)) {
RTE_LOG(ERR, EAL, "the efd_counter_size is oversized");
RTE_LOG(ERR, EAL, "the efd_counter_size is oversized\n");
return -EINVAL;
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion lib/ethdev/ethdev_pci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev,
struct rte_pci_device *pci_dev)
{
if ((eth_dev == NULL) || (pci_dev == NULL)) {
RTE_ETHDEV_LOG(ERR, "NULL pointer eth_dev=%p pci_dev=%p",
RTE_ETHDEV_LOG(ERR, "NULL pointer eth_dev=%p pci_dev=%p\n",
(void *)eth_dev, (void *)pci_dev);
return;
}
Expand Down
40 changes: 20 additions & 20 deletions lib/ethdev/rte_ethdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id)
uint16_t pid;

if (name == NULL) {
RTE_ETHDEV_LOG(ERR, "Cannot get port ID from NULL name");
RTE_ETHDEV_LOG(ERR, "Cannot get port ID from NULL name\n");
return -EINVAL;
}

Expand Down Expand Up @@ -2097,41 +2097,41 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
nb_rx_desc = cap.max_nb_desc;
if (nb_rx_desc > cap.max_nb_desc) {
RTE_ETHDEV_LOG(ERR,
"Invalid value for nb_rx_desc(=%hu), should be: <= %hu",
"Invalid value for nb_rx_desc(=%hu), should be: <= %hu\n",
nb_rx_desc, cap.max_nb_desc);
return -EINVAL;
}
if (conf->peer_count > cap.max_rx_2_tx) {
RTE_ETHDEV_LOG(ERR,
"Invalid value for number of peers for Rx queue(=%u), should be: <= %hu",
"Invalid value for number of peers for Rx queue(=%u), should be: <= %hu\n",
conf->peer_count, cap.max_rx_2_tx);
return -EINVAL;
}
if (conf->use_locked_device_memory && !cap.rx_cap.locked_device_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to use locked device memory for Rx queue, which is not supported");
"Attempt to use locked device memory for Rx queue, which is not supported\n");
return -EINVAL;
}
if (conf->use_rte_memory && !cap.rx_cap.rte_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to use DPDK memory for Rx queue, which is not supported");
"Attempt to use DPDK memory for Rx queue, which is not supported\n");
return -EINVAL;
}
if (conf->use_locked_device_memory && conf->use_rte_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to use mutually exclusive memory settings for Rx queue");
"Attempt to use mutually exclusive memory settings for Rx queue\n");
return -EINVAL;
}
if (conf->force_memory &&
!conf->use_locked_device_memory &&
!conf->use_rte_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to force Rx queue memory settings, but none is set");
"Attempt to force Rx queue memory settings, but none is set\n");
return -EINVAL;
}
if (conf->peer_count == 0) {
RTE_ETHDEV_LOG(ERR,
"Invalid value for number of peers for Rx queue(=%u), should be: > 0",
"Invalid value for number of peers for Rx queue(=%u), should be: > 0\n",
conf->peer_count);
return -EINVAL;
}
Expand All @@ -2141,7 +2141,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
count++;
}
if (count > cap.max_nb_queues) {
RTE_ETHDEV_LOG(ERR, "To many Rx hairpin queues max is %d",
RTE_ETHDEV_LOG(ERR, "To many Rx hairpin queues max is %d\n",
cap.max_nb_queues);
return -EINVAL;
}
Expand Down Expand Up @@ -2286,41 +2286,41 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
nb_tx_desc = cap.max_nb_desc;
if (nb_tx_desc > cap.max_nb_desc) {
RTE_ETHDEV_LOG(ERR,
"Invalid value for nb_tx_desc(=%hu), should be: <= %hu",
"Invalid value for nb_tx_desc(=%hu), should be: <= %hu\n",
nb_tx_desc, cap.max_nb_desc);
return -EINVAL;
}
if (conf->peer_count > cap.max_tx_2_rx) {
RTE_ETHDEV_LOG(ERR,
"Invalid value for number of peers for Tx queue(=%u), should be: <= %hu",
"Invalid value for number of peers for Tx queue(=%u), should be: <= %hu\n",
conf->peer_count, cap.max_tx_2_rx);
return -EINVAL;
}
if (conf->use_locked_device_memory && !cap.tx_cap.locked_device_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to use locked device memory for Tx queue, which is not supported");
"Attempt to use locked device memory for Tx queue, which is not supported\n");
return -EINVAL;
}
if (conf->use_rte_memory && !cap.tx_cap.rte_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to use DPDK memory for Tx queue, which is not supported");
"Attempt to use DPDK memory for Tx queue, which is not supported\n");
return -EINVAL;
}
if (conf->use_locked_device_memory && conf->use_rte_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to use mutually exclusive memory settings for Tx queue");
"Attempt to use mutually exclusive memory settings for Tx queue\n");
return -EINVAL;
}
if (conf->force_memory &&
!conf->use_locked_device_memory &&
!conf->use_rte_memory) {
RTE_ETHDEV_LOG(ERR,
"Attempt to force Tx queue memory settings, but none is set");
"Attempt to force Tx queue memory settings, but none is set\n");
return -EINVAL;
}
if (conf->peer_count == 0) {
RTE_ETHDEV_LOG(ERR,
"Invalid value for number of peers for Tx queue(=%u), should be: > 0",
"Invalid value for number of peers for Tx queue(=%u), should be: > 0\n",
conf->peer_count);
return -EINVAL;
}
Expand All @@ -2330,7 +2330,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
count++;
}
if (count > cap.max_nb_queues) {
RTE_ETHDEV_LOG(ERR, "To many Tx hairpin queues max is %d",
RTE_ETHDEV_LOG(ERR, "To many Tx hairpin queues max is %d\n",
cap.max_nb_queues);
return -EINVAL;
}
Expand Down Expand Up @@ -6152,7 +6152,7 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id,
}

if (reassembly_capa == NULL) {
RTE_ETHDEV_LOG(ERR, "Cannot get reassembly capability to NULL");
RTE_ETHDEV_LOG(ERR, "Cannot get reassembly capability to NULL\n");
return -EINVAL;
}

Expand Down Expand Up @@ -6182,7 +6182,7 @@ rte_eth_ip_reassembly_conf_get(uint16_t port_id,
}

if (conf == NULL) {
RTE_ETHDEV_LOG(ERR, "Cannot get reassembly info to NULL");
RTE_ETHDEV_LOG(ERR, "Cannot get reassembly info to NULL\n");
return -EINVAL;
}

Expand All @@ -6205,7 +6205,7 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id,
if (dev->data->dev_configured == 0) {
RTE_ETHDEV_LOG(ERR,
"Device with port_id=%u is not configured.\n"
"Cannot set IP reassembly configuration",
"Cannot set IP reassembly configuration\n",
port_id);
return -EINVAL;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/lpm/rte_lpm6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ rte_lpm6_create(const char *name, int socket_id,

rules_tbl = rte_hash_create(&rule_hash_tbl_params);
if (rules_tbl == NULL) {
RTE_LOG(ERR, LPM, "LPM rules hash table allocation failed: %s (%d)",
RTE_LOG(ERR, LPM, "LPM rules hash table allocation failed: %s (%d)\n",
rte_strerror(rte_errno), rte_errno);
goto fail_wo_unlock;
}
Expand All @@ -289,7 +289,7 @@ rte_lpm6_create(const char *name, int socket_id,
sizeof(uint32_t) * config->number_tbl8s,
RTE_CACHE_LINE_SIZE);
if (tbl8_pool == NULL) {
RTE_LOG(ERR, LPM, "LPM tbl8 pool allocation failed: %s (%d)",
RTE_LOG(ERR, LPM, "LPM tbl8 pool allocation failed: %s (%d)\n",
rte_strerror(rte_errno), rte_errno);
rte_errno = ENOMEM;
goto fail_wo_unlock;
Expand All @@ -300,7 +300,7 @@ rte_lpm6_create(const char *name, int socket_id,
sizeof(struct rte_lpm_tbl8_hdr) * config->number_tbl8s,
RTE_CACHE_LINE_SIZE);
if (tbl8_hdrs == NULL) {
RTE_LOG(ERR, LPM, "LPM tbl8 headers allocation failed: %s (%d)",
RTE_LOG(ERR, LPM, "LPM tbl8 headers allocation failed: %s (%d)\n",
rte_strerror(rte_errno), rte_errno);
rte_errno = ENOMEM;
goto fail_wo_unlock;
Expand Down
2 changes: 1 addition & 1 deletion lib/power/guest_channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ guest_channel_host_connect(const char *path, unsigned int lcore_id)
flags |= O_NONBLOCK;
if (fcntl(fd, F_SETFL, flags) < 0) {
RTE_LOG(ERR, GUEST_CHANNEL, "Failed on setting non-blocking mode for "
"file %s", fd_path);
"file %s\n", fd_path);
goto error;
}
/* QEMU needs a delay after connection */
Expand Down
6 changes: 3 additions & 3 deletions lib/power/rte_power_pmd_mgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ int
rte_power_pmd_mgmt_set_pause_duration(unsigned int duration)
{
if (duration == 0) {
RTE_LOG(ERR, POWER, "Pause duration must be greater than 0, value unchanged");
RTE_LOG(ERR, POWER, "Pause duration must be greater than 0, value unchanged\n");
return -EINVAL;
}
pause_duration = duration;
Expand All @@ -707,7 +707,7 @@ rte_power_pmd_mgmt_set_scaling_freq_min(unsigned int lcore, unsigned int min)
}

if (min > scale_freq_max[lcore]) {
RTE_LOG(ERR, POWER, "Invalid min frequency: Cannot be greater than max frequency");
RTE_LOG(ERR, POWER, "Invalid min frequency: Cannot be greater than max frequency\n");
return -EINVAL;
}
scale_freq_min[lcore] = min;
Expand All @@ -727,7 +727,7 @@ rte_power_pmd_mgmt_set_scaling_freq_max(unsigned int lcore, unsigned int max)
if (max == 0)
max = UINT32_MAX;
if (max < scale_freq_min[lcore]) {
RTE_LOG(ERR, POWER, "Invalid max frequency: Cannot be less than min frequency");
RTE_LOG(ERR, POWER, "Invalid max frequency: Cannot be less than min frequency\n");
return -EINVAL;
}

Expand Down

0 comments on commit 31a09fa

Please sign in to comment.