diff options
| author | David Hildenbrand | 2019-08-16 10:47:03 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2019-08-22 14:53:49 +0200 |
| commit | 24332523f15aca16d974a9e4a353a6e09043815d (patch) | |
| tree | a258ebe368da7b0e975b09c6225524b5177e7c52 | |
| parent | s390x/tcg: Fix VERIM with 32/64 bit elements (diff) | |
| download | qemu-24332523f15aca16d974a9e4a353a6e09043815d.tar.gz qemu-24332523f15aca16d974a9e4a353a6e09043815d.tar.xz qemu-24332523f15aca16d974a9e4a353a6e09043815d.zip | |
s390x/mmu: Trace the right value if setting/getting the storage key fails
We want to trace the actual return value, not "0".
Fixes: 0f5f669147b5 ("s390x: Enable new s390-storage-keys device")
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190816084708.602-2-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | target/s390x/mmu_helper.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 7a563110f0..6cf74502ef 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -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; } |