Re: [Qemu-devel] [Qemu-trivial] [PATCH] arm: Fix invalid assert logic in op_helper.c

[Michael Tokarev]

02.06.2015 11:10, Peter Maydell wrote:
> On 2 June 2015 at 09:05, Martin Kletzander <address@hidden> wrote:
>> Boolean value '!arm_current_el(env)' can never be equal to 3.  Fix it
>> according to the comment above as currently the build fails with
>> gcc-5.1.0.
>>
>> Signed-off-by: Martin Kletzander <address@hidden>
>> ---
>>  target-arm/op_helper.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
>> index 3f5b9ab5963b..7583ae71217b 100644
>> --- a/target-arm/op_helper.c
>> +++ b/target-arm/op_helper.c
>> @@ -421,7 +421,7 @@ void HELPER(access_check_cp_reg)(CPUARMState *env, void 
>> *rip, uint32_t syndrome)
>>          /* Requesting a trap to EL2 when we're in EL3 or S-EL0/1 is
>>           * a bug in the access function.
>>           */
>> -        assert(!arm_is_secure(env) && !arm_current_el(env) == 3);
>> +        assert(!arm_is_secure(env) && arm_current_el(env) != 3);
>>          target_el = 2;
>>          break;
>>      case CP_ACCESS_TRAP_EL3:
> 
> Thanks, but there are already two versions of this patch on the list.

Hm.  So why are you sending it to -trivial, while neither of the
3 versions has been sent there?

I found this:

Message-ID: <address@hidden>
From: "Edgar E. Iglesias" <address@hidden>
Subject: [Qemu-devel] [PATCH v3 01/15] target-arm: Correct check for non-EL3
Date: Fri, 29 May 2015 16:43:13 +1000

Launchpad #1460523
https://bugs.launchpad.net/qemu/+bug/1460523

Message-Id: <address@hidden>
From: Leon Yu <address@hidden>
Subject: [Qemu-devel] [PATCH] target-arm: fix incorrect assertion in 
access_check_cp_reg helper
Date: Mon,  1 Jun 2015 12:27:12 +0000

And this incarnation.

Maybe I should queue one of these to -trivial, is it what you mean?

Thanks,

/mjt