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
88 lines
2.5 KiB
Diff
88 lines
2.5 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Tue, 25 Feb 2020 06:09:23 -0500
|
|
Subject: Sync pv
|
|
|
|
Git-commit: 6807f464961cfee1dd81c95e22ddd91fa352fcc4
|
|
References: bsc#1167075
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
linux-headers/linux/kvm.h | 45 +++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 43 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index 265099100e65b3e86d9e42e8806e..c30344ab0095e8568e785a237c89 100644
|
|
--- a/linux-headers/linux/kvm.h
|
|
+++ b/linux-headers/linux/kvm.h
|
|
@@ -474,12 +474,17 @@ struct kvm_s390_mem_op {
|
|
__u32 size; /* amount of bytes */
|
|
__u32 op; /* type of operation */
|
|
__u64 buf; /* buffer in userspace */
|
|
- __u8 ar; /* the access register number */
|
|
- __u8 reserved[31]; /* should be set to 0 */
|
|
+ union {
|
|
+ __u8 ar; /* the access register number */
|
|
+ __u32 sida_offset; /* offset into the sida */
|
|
+ __u8 reserved[32]; /* should be set to 0 */
|
|
+ };
|
|
};
|
|
/* types for kvm_s390_mem_op->op */
|
|
#define KVM_S390_MEMOP_LOGICAL_READ 0
|
|
#define KVM_S390_MEMOP_LOGICAL_WRITE 1
|
|
+#define KVM_S390_MEMOP_SIDA_READ 2
|
|
+#define KVM_S390_MEMOP_SIDA_WRITE 3
|
|
/* flags for kvm_s390_mem_op->flags */
|
|
#define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)
|
|
#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
|
|
@@ -1010,6 +1015,7 @@ struct kvm_ppc_resize_hpt {
|
|
#define KVM_CAP_ARM_NISV_TO_USER 177
|
|
#define KVM_CAP_ARM_INJECT_EXT_DABT 178
|
|
#define KVM_CAP_S390_VCPU_RESETS 179
|
|
+#define KVM_CAP_S390_PROTECTED 180
|
|
|
|
#ifdef KVM_CAP_IRQ_ROUTING
|
|
|
|
@@ -1478,6 +1484,41 @@ struct kvm_enc_region {
|
|
#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
|
|
#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
|
|
|
|
+struct kvm_s390_pv_sec_parm {
|
|
+ __u64 origin;
|
|
+ __u64 length;
|
|
+};
|
|
+
|
|
+struct kvm_s390_pv_unp {
|
|
+ __u64 addr;
|
|
+ __u64 size;
|
|
+ __u64 tweak;
|
|
+};
|
|
+
|
|
+enum pv_cmd_id {
|
|
+ KVM_PV_ENABLE,
|
|
+ KVM_PV_DISABLE,
|
|
+ KVM_PV_VM_SET_SEC_PARMS,
|
|
+ KVM_PV_VM_UNPACK,
|
|
+ KVM_PV_VM_VERIFY,
|
|
+ KVM_PV_VM_PREP_RESET,
|
|
+ KVM_PV_VM_UNSHARE_ALL,
|
|
+ KVM_PV_VCPU_CREATE,
|
|
+ KVM_PV_VCPU_DESTROY,
|
|
+};
|
|
+
|
|
+struct kvm_pv_cmd {
|
|
+ __u32 cmd; /* Command to be executed */
|
|
+ __u16 rc; /* Ultravisor return code */
|
|
+ __u16 rrc; /* Ultravisor return reason code */
|
|
+ __u64 data; /* Data or address */
|
|
+ __u32 flags; /* flags for future extensions. Must be 0 for now */
|
|
+ __u32 reserved[3];
|
|
+};
|
|
+
|
|
+/* Available with KVM_CAP_S390_PROTECTED */
|
|
+#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)
|
|
+
|
|
/* Secure Encrypted Virtualization command */
|
|
enum sev_cmd_id {
|
|
/* Guest initialization commands */
|