Re: [qemu-s390x] [PATCH-for-4.2 v2 4/6] s390x/mmu: Trace the right value if setting/getting the storage key fails

[Thomas Huth]

On 8/14/19 9:23 AM, David Hildenbrand wrote:
> We want to trace the actual return value, not "0".
> 
> Reviewed-by: Cornelia Huck <address@hidden>
> Signed-off-by: David Hildenbrand <address@hidden>
> ---
>  target/s390x/mmu_helper.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
> index c34e8d2021..d22c6b9c81 100644
> --- a/target/s390x/mmu_helper.c
> +++ b/target/s390x/mmu_helper.c
> @@ -414,7 +414,8 @@ nodat:
>      *raddr = mmu_real2abs(env, *raddr);
>  
>      if (*raddr < ram_size) {
> -        if (skeyclass->get_skeys(ss, *raddr / TARGET_PAGE_SIZE, 1, &key)) {
> +        r = skeyclass->get_skeys(ss, *raddr / TARGET_PAGE_SIZE, 1, &key);
> +        if (r) {
>              trace_get_skeys_nonzero(r);
>              return 0;
>          }
> @@ -427,7 +428,8 @@ nodat:
>              key |= SK_C;
>          }
>  
> -        if (skeyclass->set_skeys(ss, *raddr / TARGET_PAGE_SIZE, 1, &key)) {
> +        r = skeyclass->set_skeys(ss, *raddr / TARGET_PAGE_SIZE, 1, &key);
> +        if (r) {
>              trace_set_skeys_nonzero(r);
>              return 0;
>          }
> 

Fixes: 0f5f669147b52f89928bdf180165f74c4219210e
Reviewed-by: Thomas Huth <address@hidden>