yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-linux-headers-Partial-update-against-Linux-5.9-rc4.patch

a19a21
From d9a63d12b5804eb172a040a16d7e725853c41a8c Mon Sep 17 00:00:00 2001
a19a21
From: Thomas Huth <thuth@redhat.com>
a19a21
Date: Wed, 11 Nov 2020 12:03:12 -0500
a19a21
Subject: [PATCH 12/18] linux-headers: Partial update against Linux 5.9-rc4
a19a21
a19a21
RH-Author: Thomas Huth <thuth@redhat.com>
a19a21
Message-id: <20201111120316.707489-9-thuth@redhat.com>
a19a21
Patchwork-id: 99505
a19a21
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH v2 08/12] linux-headers: Partial update against Linux 5.9-rc4
a19a21
Bugzilla: 1798506
a19a21
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
a19a21
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
a19a21
RH-Acked-by: David Hildenbrand <david@redhat.com>
a19a21
a19a21
Upstream-status: N/A
a19a21
a19a21
This is based on upstream commit e6546342a830e520d14ef03aa95677611de0d90c
a19a21
but only the two files have been included (there were too many conflicts
a19a21
in the other unrelated files, so they have been dropped from this patch).
a19a21
a19a21
Signed-off-by: Thomas Huth <thuth@redhat.com>
a19a21
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
a19a21
---
a19a21
 linux-headers/asm-s390/kvm.h | 7 +++++--
a19a21
 linux-headers/linux/kvm.h    | 6 ++++++
a19a21
 2 files changed, 11 insertions(+), 2 deletions(-)
a19a21
a19a21
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
a19a21
index 0138ccb0d89..f053b8304a8 100644
a19a21
--- a/linux-headers/asm-s390/kvm.h
a19a21
+++ b/linux-headers/asm-s390/kvm.h
a19a21
@@ -231,11 +231,13 @@ struct kvm_guest_debug_arch {
a19a21
 #define KVM_SYNC_GSCB   (1UL << 9)
a19a21
 #define KVM_SYNC_BPBC   (1UL << 10)
a19a21
 #define KVM_SYNC_ETOKEN (1UL << 11)
a19a21
+#define KVM_SYNC_DIAG318 (1UL << 12)
a19a21
 
a19a21
 #define KVM_SYNC_S390_VALID_FIELDS \
a19a21
 	(KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \
a19a21
 	 KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \
a19a21
-	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN)
a19a21
+	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN | \
a19a21
+	 KVM_SYNC_DIAG318)
a19a21
 
a19a21
 /* length and alignment of the sdnx as a power of two */
a19a21
 #define SDNXC 8
a19a21
@@ -264,7 +266,8 @@ struct kvm_sync_regs {
a19a21
 	__u8 reserved2 : 7;
a19a21
 	__u8 padding1[51];	/* riccb needs to be 64byte aligned */
a19a21
 	__u8 riccb[64];		/* runtime instrumentation controls block */
a19a21
-	__u8 padding2[192];	/* sdnx needs to be 256byte aligned */
a19a21
+	__u64 diag318;		/* diagnose 0x318 info */
a19a21
+	__u8 padding2[184];	/* sdnx needs to be 256byte aligned */
a19a21
 	union {
a19a21
 		__u8 sdnx[SDNXL];  /* state description annex */
a19a21
 		struct {
a19a21
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
a19a21
index 578cd97c0d9..6bba4ec136b 100644
a19a21
--- a/linux-headers/linux/kvm.h
a19a21
+++ b/linux-headers/linux/kvm.h
a19a21
@@ -276,6 +276,7 @@ struct kvm_run {
a19a21
 		/* KVM_EXIT_FAIL_ENTRY */
a19a21
 		struct {
a19a21
 			__u64 hardware_entry_failure_reason;
a19a21
+			__u32 cpu;
a19a21
 		} fail_entry;
a19a21
 		/* KVM_EXIT_EXCEPTION */
a19a21
 		struct {
a19a21
@@ -1011,6 +1012,11 @@ struct kvm_ppc_resize_hpt {
a19a21
 #define KVM_CAP_S390_VCPU_RESETS 179
a19a21
 #define KVM_CAP_S390_PROTECTED 180
a19a21
 #define KVM_CAP_PPC_SECURE_GUEST 181
a19a21
+#define KVM_CAP_HALT_POLL 182
a19a21
+#define KVM_CAP_ASYNC_PF_INT 183
a19a21
+#define KVM_CAP_LAST_CPU 184
a19a21
+#define KVM_CAP_SMALLER_MAXPHYADDR 185
a19a21
+#define KVM_CAP_S390_DIAG318 186
a19a21
 
a19a21
 #ifdef KVM_CAP_IRQ_ROUTING
a19a21
 
a19a21
-- 
a19a21
2.27.0
a19a21