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

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