d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: remove double space in init alert messages

Browse Source 
rte_init_alert already adds a newline, don't do it twice.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Shreyansh Jain <shreyansh.jain@nxp.com>
This commit is contained in:
Stephen Hemminger 2018-10-23 09:29:15 -07:00 committed by Thomas Monjalon
parent 70efa41164
commit 08e348daab
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/librte_eal/bsdapp/eal/eal.c
View File

@ -610,7 +610,7 @@ rte_eal_init(int argc, char **argv)
internal_config.legacy_mem = true; internal_config.legacy_mem = true;
if (eal_plugins_init() < 0) { if (eal_plugins_init() < 0) {
rte_eal_init_alert("Cannot init plugins\n"); rte_eal_init_alert("Cannot init plugins");
rte_errno = EINVAL; rte_errno = EINVAL;
rte_atomic32_clear(&run_once); rte_atomic32_clear(&run_once);
return -1; return -1;
@ -625,7 +625,7 @@ rte_eal_init(int argc, char **argv)
rte_config_init(); rte_config_init();
if (rte_eal_intr_init() < 0) { if (rte_eal_intr_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n"); rte_eal_init_alert("Cannot init interrupt-handling thread");
return -1; return -1;
} }
@ -633,7 +633,7 @@ rte_eal_init(int argc, char **argv)
* bus through mp channel in the secondary process before the bus scan. * bus through mp channel in the secondary process before the bus scan.
*/ */
if (rte_mp_channel_init() < 0) { if (rte_mp_channel_init() < 0) {
rte_eal_init_alert("failed to init mp channel\n"); rte_eal_init_alert("failed to init mp channel");
if (rte_eal_process_type() == RTE_PROC_PRIMARY) { if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
rte_errno = EFAULT; rte_errno = EFAULT;
return -1; return -1;
@ -641,7 +641,7 @@ rte_eal_init(int argc, char **argv)
} }
if (rte_bus_scan()) { if (rte_bus_scan()) {
rte_eal_init_alert("Cannot scan the buses for devices\n"); rte_eal_init_alert("Cannot scan the buses for devices");
rte_errno = ENODEV; rte_errno = ENODEV;
rte_atomic32_clear(&run_once); rte_atomic32_clear(&run_once);
return -1; return -1;
@ -688,37 +688,37 @@ rte_eal_init(int argc, char **argv)
* initialize memzones first. * initialize memzones first.
*/ */
if (rte_eal_memzone_init() < 0) { if (rte_eal_memzone_init() < 0) {
rte_eal_init_alert("Cannot init memzone\n"); rte_eal_init_alert("Cannot init memzone");
rte_errno = ENODEV; rte_errno = ENODEV;
return -1; return -1;
} }
if (rte_eal_memory_init() < 0) { if (rte_eal_memory_init() < 0) {
rte_eal_init_alert("Cannot init memory\n"); rte_eal_init_alert("Cannot init memory");
rte_errno = ENOMEM; rte_errno = ENOMEM;
return -1; return -1;
} }
if (rte_eal_malloc_heap_init() < 0) { if (rte_eal_malloc_heap_init() < 0) {
rte_eal_init_alert("Cannot init malloc heap\n"); rte_eal_init_alert("Cannot init malloc heap");
rte_errno = ENODEV; rte_errno = ENODEV;
return -1; return -1;
} }
if (rte_eal_tailqs_init() < 0) { if (rte_eal_tailqs_init() < 0) {
rte_eal_init_alert("Cannot init tail queues for objects\n"); rte_eal_init_alert("Cannot init tail queues for objects");
rte_errno = EFAULT; rte_errno = EFAULT;
return -1; return -1;
} }
if (rte_eal_alarm_init() < 0) { if (rte_eal_alarm_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n"); rte_eal_init_alert("Cannot init interrupt-handling thread");
/* rte_eal_alarm_init sets rte_errno on failure. */ /* rte_eal_alarm_init sets rte_errno on failure. */
return -1; return -1;
} }
if (rte_eal_timer_init() < 0) { if (rte_eal_timer_init() < 0) {
rte_eal_init_alert("Cannot init HPET or TSC timers\n"); rte_eal_init_alert("Cannot init HPET or TSC timers");
rte_errno = ENOTSUP; rte_errno = ENOTSUP;
return -1; return -1;
} }
@ -768,14 +768,14 @@ rte_eal_init(int argc, char **argv)
/* initialize services so vdevs register service during bus_probe. */ /* initialize services so vdevs register service during bus_probe. */
ret = rte_service_init(); ret = rte_service_init();
if (ret) { if (ret) {
rte_eal_init_alert("rte_service_init() failed\n"); rte_eal_init_alert("rte_service_init() failed");
rte_errno = ENOEXEC; rte_errno = ENOEXEC;
return -1; return -1;
} }
/* Probe all the buses and devices/drivers on them */ /* Probe all the buses and devices/drivers on them */
if (rte_bus_probe()) { if (rte_bus_probe()) {
rte_eal_init_alert("Cannot probe devices\n"); rte_eal_init_alert("Cannot probe devices");
rte_errno = ENOTSUP; rte_errno = ENOTSUP;
return -1; return -1;
} }

28
lib/librte_eal/linuxapp/eal/eal.c
View File

@ -858,7 +858,7 @@ rte_eal_init(int argc, char **argv)
} }
if (eal_plugins_init() < 0) { if (eal_plugins_init() < 0) {
rte_eal_init_alert("Cannot init plugins\n"); rte_eal_init_alert("Cannot init plugins");
rte_errno = EINVAL; rte_errno = EINVAL;
rte_atomic32_clear(&run_once); rte_atomic32_clear(&run_once);
return -1; return -1;
@ -873,7 +873,7 @@ rte_eal_init(int argc, char **argv)
rte_config_init(); rte_config_init();
if (rte_eal_intr_init() < 0) { if (rte_eal_intr_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n"); rte_eal_init_alert("Cannot init interrupt-handling thread");
return -1; return -1;
} }
@ -881,7 +881,7 @@ rte_eal_init(int argc, char **argv)
* bus through mp channel in the secondary process before the bus scan. * bus through mp channel in the secondary process before the bus scan.
*/ */
if (rte_mp_channel_init() < 0) { if (rte_mp_channel_init() < 0) {
rte_eal_init_alert("failed to init mp channel\n"); rte_eal_init_alert("failed to init mp channel");
if (rte_eal_process_type() == RTE_PROC_PRIMARY) { if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
rte_errno = EFAULT; rte_errno = EFAULT;
return -1; return -1;
@ -890,12 +890,12 @@ rte_eal_init(int argc, char **argv)
/* register multi-process action callbacks for hotplug */ /* register multi-process action callbacks for hotplug */
if (rte_mp_dev_hotplug_init() < 0) { if (rte_mp_dev_hotplug_init() < 0) {
rte_eal_init_alert("failed to register mp callback for hotplug\n"); rte_eal_init_alert("failed to register mp callback for hotplug");
return -1; return -1;
} }
if (rte_bus_scan()) { if (rte_bus_scan()) {
rte_eal_init_alert("Cannot scan the buses for devices\n"); rte_eal_init_alert("Cannot scan the buses for devices");
rte_errno = ENODEV; rte_errno = ENODEV;
rte_atomic32_clear(&run_once); rte_atomic32_clear(&run_once);
return -1; return -1;
@ -953,7 +953,7 @@ rte_eal_init(int argc, char **argv)
#ifdef VFIO_PRESENT #ifdef VFIO_PRESENT
if (rte_eal_vfio_setup() < 0) { if (rte_eal_vfio_setup() < 0) {
rte_eal_init_alert("Cannot init VFIO\n"); rte_eal_init_alert("Cannot init VFIO");
rte_errno = EAGAIN; rte_errno = EAGAIN;
rte_atomic32_clear(&run_once); rte_atomic32_clear(&run_once);
return -1; return -1;
@ -964,13 +964,13 @@ rte_eal_init(int argc, char **argv)
* initialize memzones first. * initialize memzones first.
*/ */
if (rte_eal_memzone_init() < 0) { if (rte_eal_memzone_init() < 0) {
rte_eal_init_alert("Cannot init memzone\n"); rte_eal_init_alert("Cannot init memzone");
rte_errno = ENODEV; rte_errno = ENODEV;
return -1; return -1;
} }
if (rte_eal_memory_init() < 0) { if (rte_eal_memory_init() < 0) {
rte_eal_init_alert("Cannot init memory\n"); rte_eal_init_alert("Cannot init memory");
rte_errno = ENOMEM; rte_errno = ENOMEM;
return -1; return -1;
} }
@ -979,25 +979,25 @@ rte_eal_init(int argc, char **argv)
eal_hugedirs_unlock(); eal_hugedirs_unlock();
if (rte_eal_malloc_heap_init() < 0) { if (rte_eal_malloc_heap_init() < 0) {
rte_eal_init_alert("Cannot init malloc heap\n"); rte_eal_init_alert("Cannot init malloc heap");
rte_errno = ENODEV; rte_errno = ENODEV;
return -1; return -1;
} }
if (rte_eal_tailqs_init() < 0) { if (rte_eal_tailqs_init() < 0) {
rte_eal_init_alert("Cannot init tail queues for objects\n"); rte_eal_init_alert("Cannot init tail queues for objects");
rte_errno = EFAULT; rte_errno = EFAULT;
return -1; return -1;
} }
if (rte_eal_alarm_init() < 0) { if (rte_eal_alarm_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n"); rte_eal_init_alert("Cannot init interrupt-handling thread");
/* rte_eal_alarm_init sets rte_errno on failure. */ /* rte_eal_alarm_init sets rte_errno on failure. */
return -1; return -1;
} }
if (rte_eal_timer_init() < 0) { if (rte_eal_timer_init() < 0) {
rte_eal_init_alert("Cannot init HPET or TSC timers\n"); rte_eal_init_alert("Cannot init HPET or TSC timers");
rte_errno = ENOTSUP; rte_errno = ENOTSUP;
return -1; return -1;
} }
@ -1051,14 +1051,14 @@ rte_eal_init(int argc, char **argv)
/* initialize services so vdevs register service during bus_probe. */ /* initialize services so vdevs register service during bus_probe. */
ret = rte_service_init(); ret = rte_service_init();
if (ret) { if (ret) {
rte_eal_init_alert("rte_service_init() failed\n"); rte_eal_init_alert("rte_service_init() failed");
rte_errno = ENOEXEC; rte_errno = ENOEXEC;
return -1; return -1;
} }
/* Probe all the buses and devices/drivers on them */ /* Probe all the buses and devices/drivers on them */
if (rte_bus_probe()) { if (rte_bus_probe()) {
rte_eal_init_alert("Cannot probe devices\n"); rte_eal_init_alert("Cannot probe devices");
rte_errno = ENOTSUP; rte_errno = ENOTSUP;
return -1; return -1;
} }