No need to double-check if we have a write.

Found by Coverity (CID: 1381016).

Fixes: 31b59419069e ("target/s390x: Return exception from mmu_translate_real")
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
 target/s390x/mmu_helper.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 90b81335f9..c9f3f34750 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -556,9 +556,7 @@ int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw,
         *flags |= PAGE_WRITE_INV;
         if (is_low_address(raddr) && rw == MMU_DATA_STORE) {
             /* LAP sets bit 56 */
-            *tec = (raddr & TARGET_PAGE_MASK)
-                 | (rw == MMU_DATA_STORE ? FS_WRITE : FS_READ)
-                 | 0x80;
+            *tec = (raddr & TARGET_PAGE_MASK) | FS_WRITE | 0x80;
             return PGM_PROTECTION;
         }
     }
-- 
2.21.0

On 17.10.19 14:19, David Hildenbrand wrote:
> No need to double-check if we have a write.
> 
> Found by Coverity (CID: 1381016).

Copy and past error, it's 1406404.

> 
> Fixes: 31b59419069e ("target/s390x: Return exception from mmu_translate_real")
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>   target/s390x/mmu_helper.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
> index 90b81335f9..c9f3f34750 100644
> --- a/target/s390x/mmu_helper.c
> +++ b/target/s390x/mmu_helper.c
> @@ -556,9 +556,7 @@ int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw,
>           *flags |= PAGE_WRITE_INV;
>           if (is_low_address(raddr) && rw == MMU_DATA_STORE) {
>               /* LAP sets bit 56 */
> -            *tec = (raddr & TARGET_PAGE_MASK)
> -                 | (rw == MMU_DATA_STORE ? FS_WRITE : FS_READ)
> -                 | 0x80;
> +            *tec = (raddr & TARGET_PAGE_MASK) | FS_WRITE | 0x80;
>               return PGM_PROTECTION;
>           }
>       }
> 


-- 

Thanks,

David / dhildenb

On 10/17/19 5:20 AM, David Hildenbrand wrote:
> On 17.10.19 14:19, David Hildenbrand wrote:
>> No need to double-check if we have a write.
>>
>> Found by Coverity (CID: 1381016).
> 
> Copy and past error, it's 1406404.
> 
>>
>> Fixes: 31b59419069e ("target/s390x: Return exception from mmu_translate_real")
>> Cc: Peter Maydell <peter.maydell@linaro.org>
>> Signed-off-by: David Hildenbrand <david@redhat.com>
>> ---

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

On Thu, 17 Oct 2019 14:19:22 +0200
David Hildenbrand <david@redhat.com> wrote:

> No need to double-check if we have a write.
> 
> Found by Coverity (CID: 1381016).
> 
> Fixes: 31b59419069e ("target/s390x: Return exception from mmu_translate_real")
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  target/s390x/mmu_helper.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
> index 90b81335f9..c9f3f34750 100644
> --- a/target/s390x/mmu_helper.c
> +++ b/target/s390x/mmu_helper.c
> @@ -556,9 +556,7 @@ int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw,
>          *flags |= PAGE_WRITE_INV;
>          if (is_low_address(raddr) && rw == MMU_DATA_STORE) {
>              /* LAP sets bit 56 */
> -            *tec = (raddr & TARGET_PAGE_MASK)
> -                 | (rw == MMU_DATA_STORE ? FS_WRITE : FS_READ)
> -                 | 0x80;
> +            *tec = (raddr & TARGET_PAGE_MASK) | FS_WRITE | 0x80;
>              return PGM_PROTECTION;
>          }
>      }

Thanks, applied.