eal: correct error log for alarm
PATCH 1/1 eal: correct error log for alarm
--- lib/librte_eal/linux/eal/eal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/librte_eal/linux/eal/eal.c +1 -1
@@ -1006,7 +1006,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread" ); +rte_eal_init_alert ("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ; }
Signature · 1 line
2.17.1
Hello,
Quoted 23 lines · Xiaolong Ye
Fixes af75078fece3 ("first public release")Signed-off-by Xiaolong Ye <[email protected]>--- lib/librte_eal/linux/eal/eal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/librte_eal/linux/eal/eal.c +1
-1@@ -1006,7 +1006,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ;}
Quoted 4 lines
--
2.17.1
The same applies to freebsd eal.
lib/librte_eal/freebsd/eal/eal.c: if (rte_eal_alarm_init() < 0) {lib/librte_eal/freebsd/eal/eal.c- rte_eal_init_alert("Cannot
init interrupt-handling thread");
Signature · 1 line
David Marchand
Quoted 33 lines · David Marchand
Hello,
Quoted 23 lines · Xiaolong Ye
Fixes af75078fece3 ("first public release")Signed-off-by Xiaolong Ye <[email protected]>--- lib/librte_eal/linux/eal/eal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/librte_eal/linux/eal/eal.c +1
-1@@ -1006,7 +1006,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ;}Quoted 4 lines
--
2.17.1The same applies to freebsd eal.
Quoted 3 lines
lib/librte_eal/freebsd/eal/eal.c: if (rte_eal_alarm_init()< 0) {lib/librte_eal/freebsd/eal/eal.c-rte_eal_init_alert("Cannot
init interrupt-handling thread");
Er, yes, do I need to make another separate patch or just add the freebsd fix into this patch?
Thanks,
Xiaolong
Quoted 4 lines
Signature · 2 lines
-- David Marchand
Quoted 34 lines · Ye Xiaolong
Quoted 33 lines · David Marchand
Hello,
Quoted 23 lines · Xiaolong Ye
Fixes af75078fece3 ("first public release")Signed-off-by Xiaolong Ye <[email protected]>--- lib/librte_eal/linux/eal/eal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/librte_eal/linux/eal/eal.c +1
-1@@ -1006,7 +1006,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ;}Quoted 4 lines
--
2.17.1The same applies to freebsd eal.
Quoted 8 lines
Quoted 3 lines
lib/librte_eal/freebsd/eal/eal.c: if (rte_eal_alarm_init()< 0) {lib/librte_eal/freebsd/eal/eal.c-rte_eal_init_alert("Cannot
init interrupt-handling thread");Er, yes, do I need to make another separate patch or just add the freebsd fix
into this patch?
$ git fixline 764bf268
Fixes: 764bf26873b9 ("add FreeBSD support")
$ git describe --contains 764bf268
v1.6.0r0~58Both fixes are old enough to be relevant to the same stable branches (if we want to backport this), so you can add it to this patch yes.
Signature · 1 line
David Marchand
Quoted 45 lines · David Marchand
Quoted 34 lines · Ye Xiaolong
Quoted 33 lines · David Marchand
Hello,
Quoted 23 lines · Xiaolong Ye
Fixes af75078fece3 ("first public release")Signed-off-by Xiaolong Ye <[email protected]>--- lib/librte_eal/linux/eal/eal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/librte_eal/linux/eal/eal.c +1
-1@@ -1006,7 +1006,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ;}Quoted 4 lines
--
2.17.1The same applies to freebsd eal.
Quoted 8 lines
Quoted 3 lines
lib/librte_eal/freebsd/eal/eal.c: if (rte_eal_alarm_init()< 0) {lib/librte_eal/freebsd/eal/eal.c-rte_eal_init_alert("Cannot
init interrupt-handling thread");Er, yes, do I need to make another separate patch or just add the freebsd fix
into this patch?
Quoted 8 lines
$ git fixline 764bf268 Fixes: 764bf26873b9 ("add FreeBSD support") $ git describe --contains 764bf268 v1.6.0r0~58Both fixes are old enough to be relevant to the same stable branches (if we want to backport this), so you can add it to this patch yes.
Agree, will squash freebsd fix into this patch and send v2.
Thanks,
Xiaolong
Quoted 3 lines
Signature · 2 lines
-- David Marchand
PATCH v2 1/1 eal: correct error log for alarm
In reply to Xiaolong Ye---
v2:
add freebsd fix suggested by David
lib/librte_eal/freebsd/eal/eal.c | 2 +- lib/librte_eal/linux/eal/eal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
lib/librte_eal/freebsd/eal/eal.c +1 -1
@@ -663,7 +663,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread" ); +rte_eal_init_alert ("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ; }
lib/librte_eal/linux/eal/eal.c +1 -1
@@ -1006,7 +1006,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread" ); +rte_eal_init_alert ("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ; }
Signature · 1 line
2.17.1
Quoted 45 lines · Xiaolong Ye
Fixes af75078fece3 ("first public release")Fixes 764bf26873b9 ("add FreeBSD support")Signed-off-by Xiaolong Ye <[email protected]>---
v2:
add freebsd fix suggested by David
lib/librte_eal/freebsd/eal/eal.c | 2 +- lib/librte_eal/linux/eal/eal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)lib/librte_eal/freebsd/eal/eal.c +1
-1@@ -663,7 +663,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ;}lib/librte_eal/linux/eal/eal.c +1
-1@@ -1006,7 +1006,7 @@ rte_eal_init(int argc, char **argv) }if (rte_eal_alarm_init () <0 ) { -rte_eal_init_alert ("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm" );/* rte_eal_alarm_init sets rte_errno on failure. */ return -1 ;}
Quoted 4 lines
--
2.17.1
Signature · 1 line
David Marchand
Thomas Monjalon
Applied05/06/2019 09:31, David Marchand:
Quoted 9 lines · Xiaolong Ye
Quoted 7 lines
Fixes af75078fece3 ("first public release")Fixes 764bf26873b9 ("add FreeBSD support")Signed-off-by Xiaolong Ye <[email protected]>Reviewed-by David Marchand <[email protected]>
Applied, thanks