[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL for-2.12 7/8] s390x/mmu: don't overwrite pending exce
From: |
Cornelia Huck |
Subject: |
[qemu-s390x] [PULL for-2.12 7/8] s390x/mmu: don't overwrite pending exception in mmu translate |
Date: |
Mon, 9 Apr 2018 17:15:32 +0200 |
From: David Hildenbrand <address@hidden>
If we already triggered another exception, don't overwrite it with a
protection exception.
Only applies to old KVM instances without the virtual memory access
IOCTL in KVM.
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/mmu_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 1deeb6e6e4..a25deef5dd 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -325,7 +325,7 @@ static int mmu_translate_asce(CPUS390XState *env,
target_ulong vaddr,
r = mmu_translate_region(env, vaddr, asc, asce, level, raddr, flags, rw,
exc);
- if (rw == MMU_DATA_STORE && !(*flags & PAGE_WRITE)) {
+ if (!r && rw == MMU_DATA_STORE && !(*flags & PAGE_WRITE)) {
trigger_prot_fault(env, vaddr, asc, rw, exc);
return -1;
}
--
2.14.3
- [qemu-s390x] [PULL for-2.12 0/8] s390x fixes for -rc3, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 2/8] s390: Refactor IPL parameter block generation, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 3/8] s390: Ensure IPL from SCSI works as expected, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 4/8] s390: Do not pass inofficial IPL type to the guest, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 1/8] s390x/kvm: call cpu_synchronize_state() on every kvm_arch_handle_exit(), Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 7/8] s390x/mmu: don't overwrite pending exception in mmu translate,
Cornelia Huck <=
- [qemu-s390x] [PULL for-2.12 6/8] vfio-ccw: fix memory leaks in vfio_ccw_realize(), Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 8/8] s390x: load_psw() should only exchange the PSW for KVM, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 5/8] pc-bios/s390: update images, Cornelia Huck, 2018/04/09
- Re: [qemu-s390x] [PULL for-2.12 0/8] s390x fixes for -rc3, Peter Maydell, 2018/04/10