From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 1 Oct 2019 17:16:10 +0000 (-0700)
Subject: target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw
X-Git-Tag: v4.2.0-rc0~65^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2550953b20f609326e7bde2ee48d9852d5c21c94;p=thirdparty%2Fqemu.git

target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw

For TCG, we will always call s390_cpu_virt_mem_handle_exc,
which will go through the unwinder to set ILEN.  For KVM,
we do not go through do_program_interrupt, so this argument
is unused.

Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20191001171614.8405-15-richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 869debd30a7..df58fb73baa 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -510,7 +510,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,
 
     ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec);
     if (ret) {
-        trigger_access_exception(&cpu->env, ret, ILEN_AUTO, tec);
+        trigger_access_exception(&cpu->env, ret, ILEN_UNWIND, tec);
     } else if (hostbuf != NULL) {
         /* Copy data by stepping through the area page by page */
         for (i = 0; i < nr_pages; i++) {