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
62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Fri, 13 Mar 2020 10:35:02 -0400
|
|
Subject: s390x: Move diagnose 308 subcodes and rcs into ipl.h
|
|
|
|
References: bsc#1167075
|
|
|
|
They are part of the IPL process, so let's put them into the ipl
|
|
header.
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
(cherry picked from commit 284bc3dd6e9a978e6e34b00777ce72007a88d6d9)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/s390x/ipl.h | 11 +++++++++++
|
|
target/s390x/diag.c | 11 -----------
|
|
2 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
|
|
index 3e44abe1c651d8a01f4708c2801c..a5665e6bfde2e8cfbb1b2e6c7234 100644
|
|
--- a/hw/s390x/ipl.h
|
|
+++ b/hw/s390x/ipl.h
|
|
@@ -159,6 +159,17 @@ struct S390IPLState {
|
|
typedef struct S390IPLState S390IPLState;
|
|
QEMU_BUILD_BUG_MSG(offsetof(S390IPLState, iplb) & 3, "alignment of iplb wrong");
|
|
|
|
+#define DIAG_308_RC_OK 0x0001
|
|
+#define DIAG_308_RC_NO_CONF 0x0102
|
|
+#define DIAG_308_RC_INVALID 0x0402
|
|
+
|
|
+#define DIAG308_RESET_MOD_CLR 0
|
|
+#define DIAG308_RESET_LOAD_NORM 1
|
|
+#define DIAG308_LOAD_CLEAR 3
|
|
+#define DIAG308_LOAD_NORMAL_DUMP 4
|
|
+#define DIAG308_SET 5
|
|
+#define DIAG308_STORE 6
|
|
+
|
|
#define S390_IPL_TYPE_FCP 0x00
|
|
#define S390_IPL_TYPE_CCW 0x02
|
|
#define S390_IPL_TYPE_QEMU_SCSI 0xff
|
|
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
|
|
index 54e5670b3fd6d960bd3fb4baca8b..8aba6341f94848e1ce8fff420ed8 100644
|
|
--- a/target/s390x/diag.c
|
|
+++ b/target/s390x/diag.c
|
|
@@ -49,17 +49,6 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
|
|
return diag288_class->handle_timer(diag288, func, timeout);
|
|
}
|
|
|
|
-#define DIAG_308_RC_OK 0x0001
|
|
-#define DIAG_308_RC_NO_CONF 0x0102
|
|
-#define DIAG_308_RC_INVALID 0x0402
|
|
-
|
|
-#define DIAG308_RESET_MOD_CLR 0
|
|
-#define DIAG308_RESET_LOAD_NORM 1
|
|
-#define DIAG308_LOAD_CLEAR 3
|
|
-#define DIAG308_LOAD_NORMAL_DUMP 4
|
|
-#define DIAG308_SET 5
|
|
-#define DIAG308_STORE 6
|
|
-
|
|
static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64_t addr,
|
|
uintptr_t ra, bool write)
|
|
{
|