Commit 24332523 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/mmu: Trace the right value if setting/getting the storage key fails 



We want to trace the actual return value, not "0".

Fixes: 0f5f6691 ("s390x: Enable new s390-storage-keys device")
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20190816084708.602-2-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 25bcb45d

target/s390x/mmu_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -423,7 +423,8 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, 
    *raddr = mmu_real2abs(env, *raddr);



    if (r == 0 && *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;

        }
@@ -436,7 +437,8 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, 
            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;

        }