a447edb5e5
- Include upstream patches targeted for the next stable release (bug fixes only) block-io-fix-bdrv_co_do_copy_on_readv.patch compat-disable-edid-on-correct-virtio-gp.patch target-ppc-Fix-rlwinm-on-ppc64.patch vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch - s390x Protected Virtualization support - start and control guest in secure mode. (note: binary patch from patch series dropped since for s390x we rebuild the patched binary anyways) (bsc#1167075 jsc#SLE-7407) s390-sclp-improve-special-wait-psw-logic.patch s390x-Add-missing-vcpu-reset-functions.patch s390x-Add-SIDA-memory-ops.patch s390x-Add-unpack-facility-feature-to-GA1.patch s390x-Beautify-diag308-handling.patch s390x-Don-t-do-a-normal-reset-on-the-ini.patch s390x-ipl-Consolidate-iplb-validity-chec.patch s390x-kvm-Make-kvm_sclp_service_call-voi.patch s390x-Move-clear-reset.patch s390x-Move-diagnose-308-subcodes-and-rcs.patch s390x-Move-initial-reset.patch s390x-Move-reset-normal-to-shared-reset-.patch s390x-protvirt-Add-migration-blocker.patch s390x-protvirt-Disable-address-checks-fo.patch s390x-protvirt-Handle-SIGP-store-status-.patch s390x-protvirt-Inhibit-balloon-when-swit.patch s390x-protvirt-KVM-intercept-changes.patch s390x-protvirt-Move-diag-308-data-over-S.patch s390x-protvirt-Move-IO-control-structure.patch s390x-protvirt-Move-STSI-data-over-SIDAD.patch s390x-protvirt-SCLP-interpretation.patch s390x-protvirt-Set-guest-IPL-PSW.patch s390x-protvirt-Support-unpack-facility.patch Sync-pv.patch OBS-URL: https://build.opensuse.org/request/show/787000 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=538
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Date: Thu, 20 Feb 2020 14:16:22 +0100
|
|
Subject: s390/sclp: improve special wait psw logic
|
|
|
|
References: bsc#1167075
|
|
|
|
There is a special quiesce PSW that we check for "shutdown". Otherwise disabled
|
|
wait is detected as "crashed". Architecturally we must only check PSW bits
|
|
116-127. Fix this.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Message-Id: <1582204582-22995-1-git-send-email-borntraeger@de.ibm.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Acked-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit 8b51c0961cc13e55b26bb6665ec3a341abdc7658)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/s390x/helper.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/target/s390x/helper.c b/target/s390x/helper.c
|
|
index a3a49164e471b3f00a40020f987d..6808dfda01f42acbaa1d36ef787b 100644
|
|
--- a/target/s390x/helper.c
|
|
+++ b/target/s390x/helper.c
|
|
@@ -89,7 +89,7 @@ hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr vaddr)
|
|
static inline bool is_special_wait_psw(uint64_t psw_addr)
|
|
{
|
|
/* signal quiesce */
|
|
- return psw_addr == 0xfffUL;
|
|
+ return (psw_addr & 0xfffUL) == 0xfffUL;
|
|
}
|
|
|
|
void s390_handle_wait(S390CPU *cpu)
|