1f88dea66c
- Updating to Sphinx v3.1.2 in Factory is exposing an issue in qemu doc sources. Fix it docs-fix-trace-docs-build-with-sphinx-3..patch - Fix DoS possibility in ati-vga emulation (CVE-2020-13800 bsc#1172495) ati-vga-check-mm_index-before-recursive-.patch - Fix DoS possibility in Network Block Device (nbd) support infrastructure (CVE-2020-10761 bsc#1172710) nbd-server-Avoid-long-error-message-asse.patch - Fix null pointer dereference possibility (DoS) in MegaRAID SAS 8708EM2 emulation (CVE-2020-13659 bsc#1172386) exec-set-map-length-to-zero-when-returni.patch - Fix OOB access possibility in MegaRAID SAS 8708EM2 emulation (CVE-2020-13362 bsc#1172383) megasas-use-unsigned-type-for-reply_queu.patch - Fix legacy IGD passthrough hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch - The latest gcc10 available in Factory has the fix for the issue this patch was created to avoid, so drop it build-Work-around-gcc10-bug-by-not-using.patch - Switch to upstream versions of some patches we carry add-enum-cast-to-avoid-gcc10-warning.patch -> golan-Add-explicit-type-casts-for-nodnic.patch Be-explicit-about-fcommon-compiler-direc.patch -> build-Be-explicit-about-fcommon-compiler.patch Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch -> build-Do-not-apply-WORKAROUND_CFLAGS-for.patch Fix-s-directive-argument-is-null-error.patch -> build-Fix-s-directive-argument-is-null-e.patch Workaround-compilation-error-with-gcc-9..patch -> build-Workaround-compilation-error-with-.patch work-around-gcc10-problem-with-zero-leng.patch -> intel-Avoid-spurious-compiler-warning-on.patch - Fix vgabios issue for cirrus graphics emulation, which effectively downgraded it to standard VGA behavior vga-fix-cirrus-bios.patch - Fix OOB access possibility in ES1370 audio device emulation (CVE-2020-13361 bsc#1172384) es1370-check-total-frame-count-against-c.patch OBS-URL: https://build.opensuse.org/request/show/822154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=553
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
|
|
|
|
Git-commit: 284bc3dd6e9a978e6e34b00777ce72007a88d6d9
|
|
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>
|
|
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)
|
|
{
|