[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.12 8/8] s390x: load_psw() should only exchange
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.12 8/8] s390x: load_psw() should only exchange the PSW for KVM |
Date: |
Mon, 9 Apr 2018 17:15:33 +0200 |
From: David Hildenbrand <address@hidden>
Let's simplify it a bit. On some weird circumstances we would have
tried to recompute watchpoints when running under KVM. load_psw() is
called from do_restart_interrupt() during a SIGP RESTART if the target
CPU is STOPPED. Let's touch watchpoints only in the TCG case - where
they are used for PER emulation.
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/helper.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 615fa24ab9..e8548f340a 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -103,16 +103,18 @@ void load_psw(CPUS390XState *env, uint64_t mask, uint64_t
addr)
env->psw.addr = addr;
env->psw.mask = mask;
- if (tcg_enabled()) {
- env->cc_op = (mask >> 44) & 3;
+
+ /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait */
+ if (!tcg_enabled()) {
+ return;
}
+ env->cc_op = (mask >> 44) & 3;
if ((old_mask ^ mask) & PSW_MASK_PER) {
s390_cpu_recompute_watchpoints(CPU(s390_env_get_cpu(env)));
}
- /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait */
- if (tcg_enabled() && (mask & PSW_MASK_WAIT)) {
+ if (mask & PSW_MASK_WAIT) {
s390_handle_wait(s390_env_get_cpu(env));
}
}
--
2.14.3
- [Qemu-devel] [PULL for-2.12 0/8] s390x fixes for -rc3, Cornelia Huck, 2018/04/09
- [Qemu-devel] [PULL for-2.12 2/8] s390: Refactor IPL parameter block generation, Cornelia Huck, 2018/04/09
- [Qemu-devel] [PULL for-2.12 3/8] s390: Ensure IPL from SCSI works as expected, Cornelia Huck, 2018/04/09
- [Qemu-devel] [PULL for-2.12 4/8] s390: Do not pass inofficial IPL type to the guest, Cornelia Huck, 2018/04/09
- [Qemu-devel] [PULL for-2.12 1/8] s390x/kvm: call cpu_synchronize_state() on every kvm_arch_handle_exit(), Cornelia Huck, 2018/04/09
- [Qemu-devel] [PULL for-2.12 7/8] s390x/mmu: don't overwrite pending exception in mmu translate, Cornelia Huck, 2018/04/09
- [Qemu-devel] [PULL for-2.12 6/8] vfio-ccw: fix memory leaks in vfio_ccw_realize(), Cornelia Huck, 2018/04/09
- [Qemu-devel] [PULL for-2.12 8/8] s390x: load_psw() should only exchange the PSW for KVM,
Cornelia Huck <=
- [Qemu-devel] [PULL for-2.12 5/8] pc-bios/s390: update images, Cornelia Huck, 2018/04/09
- Re: [Qemu-devel] [PULL for-2.12 0/8] s390x fixes for -rc3, Peter Maydell, 2018/04/10