eal: correct error log for alarm

Message ID 20190604163147.105791-1-xiaolong.ye@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series eal: correct error log for alarm |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

Xiaolong Ye June 4, 2019, 4:31 p.m. UTC
  Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 lib/librte_eal/linux/eal/eal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Xiaolong Ye June 5, 2019, 6:49 a.m. UTC | #1
On 06/05, David Marchand wrote:
>Hello,
>
>On Tue, Jun 4, 2019 at 6:41 PM Xiaolong Ye <xiaolong.ye@intel.com> wrote:
>
>> Fixes: af75078fece3 ("first public release")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
>> ---
>>  lib/librte_eal/linux/eal/eal.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_eal/linux/eal/eal.c
>> b/lib/librte_eal/linux/eal/eal.c
>> index 161399619..10e2887ca 100644
>> --- a/lib/librte_eal/linux/eal/eal.c
>> +++ b/lib/librte_eal/linux/eal/eal.c
>> @@ -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;
>>         }
>> --
>> 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");

Er, yes, do I need to make another separate patch or just add the freebsd fix
into this patch?

Thanks,
Xiaolong

>
>
>-- 
>David Marchand
  
David Marchand June 5, 2019, 6:51 a.m. UTC | #2
Hello,

On Tue, Jun 4, 2019 at 6:41 PM Xiaolong Ye <xiaolong.ye@intel.com> wrote:

> Fixes: af75078fece3 ("first public release")
> Cc: stable@dpdk.org
>
> Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
> ---
>  lib/librte_eal/linux/eal/eal.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_eal/linux/eal/eal.c
> b/lib/librte_eal/linux/eal/eal.c
> index 161399619..10e2887ca 100644
> --- a/lib/librte_eal/linux/eal/eal.c
> +++ b/lib/librte_eal/linux/eal/eal.c
> @@ -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;
>         }
> --
> 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");
  
Xiaolong Ye June 5, 2019, 7:12 a.m. UTC | #3
On 06/05, David Marchand wrote:
>On Wed, Jun 5, 2019 at 8:58 AM Ye Xiaolong <xiaolong.ye@intel.com> wrote:
>
>> On 06/05, David Marchand wrote:
>> >Hello,
>> >
>> >On Tue, Jun 4, 2019 at 6:41 PM Xiaolong Ye <xiaolong.ye@intel.com> wrote:
>> >
>> >> Fixes: af75078fece3 ("first public release")
>> >> Cc: stable@dpdk.org
>> >>
>> >> Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
>> >> ---
>> >>  lib/librte_eal/linux/eal/eal.c | 2 +-
>> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/lib/librte_eal/linux/eal/eal.c
>> >> b/lib/librte_eal/linux/eal/eal.c
>> >> index 161399619..10e2887ca 100644
>> >> --- a/lib/librte_eal/linux/eal/eal.c
>> >> +++ b/lib/librte_eal/linux/eal/eal.c
>> >> @@ -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;
>> >>         }
>> >> --
>> >> 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");
>>
>> 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~58
>
>Both 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
>
>-- 
>David Marchand
  
David Marchand June 5, 2019, 7:13 a.m. UTC | #4
On Wed, Jun 5, 2019 at 8:58 AM Ye Xiaolong <xiaolong.ye@intel.com> wrote:

> On 06/05, David Marchand wrote:
> >Hello,
> >
> >On Tue, Jun 4, 2019 at 6:41 PM Xiaolong Ye <xiaolong.ye@intel.com> wrote:
> >
> >> Fixes: af75078fece3 ("first public release")
> >> Cc: stable@dpdk.org
> >>
> >> Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
> >> ---
> >>  lib/librte_eal/linux/eal/eal.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/lib/librte_eal/linux/eal/eal.c
> >> b/lib/librte_eal/linux/eal/eal.c
> >> index 161399619..10e2887ca 100644
> >> --- a/lib/librte_eal/linux/eal/eal.c
> >> +++ b/lib/librte_eal/linux/eal/eal.c
> >> @@ -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;
> >>         }
> >> --
> >> 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");
>
> 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~58

Both 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.
  

Patch

diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index 161399619..10e2887ca 100644
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -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;
 	}