yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From be13671e5df3d44fe0e29736e625a53f4d451d9f Mon Sep 17 00:00:00 2001
26ba25
From: Thomas Huth <thuth@redhat.com>
26ba25
Date: Mon, 15 Oct 2018 10:19:26 +0100
26ba25
Subject: [PATCH 1/6] linux-headers: update
26ba25
26ba25
RH-Author: Thomas Huth <thuth@redhat.com>
26ba25
Message-id: <1539598771-16223-2-git-send-email-thuth@redhat.com>
26ba25
Patchwork-id: 82696
26ba25
O-Subject: [RHEL-8 qemu-kvm PATCH 1/6] linux-headers: update
26ba25
Bugzilla: 1508142
26ba25
RH-Acked-by: David Hildenbrand <david@redhat.com>
26ba25
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
26ba25
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
26ba25
26ba25
From: Cornelia Huck <cohuck@redhat.com>
26ba25
26ba25
Update to kvm/next commit dd5bd0a65ff6 ("Merge tag 'kvm-s390-next-4.20-1'
26ba25
of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD")
26ba25
26ba25
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
26ba25
(cherry picked from commit 8f3cd250a897213d39e621e3d824507b48158d42)
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
26ba25
Conflicts:
26ba25
	linux-headers/linux/kvm.h
26ba25
	linux-headers/linux/vhost.h
26ba25
	(simple contextual conflicts due to some missing patches in downstream)
26ba25
26ba25
Signed-off-by: Thomas Huth <thuth@redhat.com>
26ba25
---
26ba25
 include/standard-headers/linux/input.h |  9 +++++----
26ba25
 linux-headers/asm-arm/kvm.h            | 13 +++++++++++++
26ba25
 linux-headers/asm-arm64/kvm.h          | 13 +++++++++++++
26ba25
 linux-headers/asm-s390/kvm.h           |  2 ++
26ba25
 linux-headers/asm-x86/kvm.h            |  1 +
26ba25
 linux-headers/linux/kvm.h              |  3 +++
26ba25
 linux-headers/linux/vfio.h             |  2 ++
26ba25
 linux-headers/linux/vhost.h            |  8 ++++++++
26ba25
 8 files changed, 47 insertions(+), 4 deletions(-)
26ba25
26ba25
diff --git a/include/standard-headers/linux/input.h b/include/standard-headers/linux/input.h
26ba25
index 939b627..f791b1b 100644
26ba25
--- a/include/standard-headers/linux/input.h
26ba25
+++ b/include/standard-headers/linux/input.h
26ba25
@@ -267,10 +267,11 @@ struct input_mask {
26ba25
 /*
26ba25
  * MT_TOOL types
26ba25
  */
26ba25
-#define MT_TOOL_FINGER		0
26ba25
-#define MT_TOOL_PEN		1
26ba25
-#define MT_TOOL_PALM		2
26ba25
-#define MT_TOOL_MAX		2
26ba25
+#define MT_TOOL_FINGER		0x00
26ba25
+#define MT_TOOL_PEN		0x01
26ba25
+#define MT_TOOL_PALM		0x02
26ba25
+#define MT_TOOL_DIAL		0x0a
26ba25
+#define MT_TOOL_MAX		0x0f
26ba25
 
26ba25
 /*
26ba25
  * Values describing the status of a force-feedback effect
26ba25
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
26ba25
index 4392955..3097290 100644
26ba25
--- a/linux-headers/asm-arm/kvm.h
26ba25
+++ b/linux-headers/asm-arm/kvm.h
26ba25
@@ -27,6 +27,7 @@
26ba25
 #define __KVM_HAVE_GUEST_DEBUG
26ba25
 #define __KVM_HAVE_IRQ_LINE
26ba25
 #define __KVM_HAVE_READONLY_MEM
26ba25
+#define __KVM_HAVE_VCPU_EVENTS
26ba25
 
26ba25
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
26ba25
 
26ba25
@@ -124,6 +125,18 @@ struct kvm_sync_regs {
26ba25
 struct kvm_arch_memory_slot {
26ba25
 };
26ba25
 
26ba25
+/* for KVM_GET/SET_VCPU_EVENTS */
26ba25
+struct kvm_vcpu_events {
26ba25
+	struct {
26ba25
+		__u8 serror_pending;
26ba25
+		__u8 serror_has_esr;
26ba25
+		/* Align it to 8 bytes */
26ba25
+		__u8 pad[6];
26ba25
+		__u64 serror_esr;
26ba25
+	} exception;
26ba25
+	__u32 reserved[12];
26ba25
+};
26ba25
+
26ba25
 /* If you need to interpret the index values, here is the key: */
26ba25
 #define KVM_REG_ARM_COPROC_MASK		0x000000000FFF0000
26ba25
 #define KVM_REG_ARM_COPROC_SHIFT	16
26ba25
diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h
26ba25
index 4e80651..208de22 100644
26ba25
--- a/linux-headers/asm-arm64/kvm.h
26ba25
+++ b/linux-headers/asm-arm64/kvm.h
26ba25
@@ -39,6 +39,7 @@
26ba25
 #define __KVM_HAVE_GUEST_DEBUG
26ba25
 #define __KVM_HAVE_IRQ_LINE
26ba25
 #define __KVM_HAVE_READONLY_MEM
26ba25
+#define __KVM_HAVE_VCPU_EVENTS
26ba25
 
26ba25
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
26ba25
 
26ba25
@@ -153,6 +154,18 @@ struct kvm_sync_regs {
26ba25
 struct kvm_arch_memory_slot {
26ba25
 };
26ba25
 
26ba25
+/* for KVM_GET/SET_VCPU_EVENTS */
26ba25
+struct kvm_vcpu_events {
26ba25
+	struct {
26ba25
+		__u8 serror_pending;
26ba25
+		__u8 serror_has_esr;
26ba25
+		/* Align it to 8 bytes */
26ba25
+		__u8 pad[6];
26ba25
+		__u64 serror_esr;
26ba25
+	} exception;
26ba25
+	__u32 reserved[12];
26ba25
+};
26ba25
+
26ba25
 /* If you need to interpret the index values, here is the key: */
26ba25
 #define KVM_REG_ARM_COPROC_MASK		0x000000000FFF0000
26ba25
 #define KVM_REG_ARM_COPROC_SHIFT	16
26ba25
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
26ba25
index 1ab9901..0265482 100644
26ba25
--- a/linux-headers/asm-s390/kvm.h
26ba25
+++ b/linux-headers/asm-s390/kvm.h
26ba25
@@ -160,6 +160,8 @@ struct kvm_s390_vm_cpu_subfunc {
26ba25
 #define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW	1
26ba25
 #define KVM_S390_VM_CRYPTO_DISABLE_AES_KW	2
26ba25
 #define KVM_S390_VM_CRYPTO_DISABLE_DEA_KW	3
26ba25
+#define KVM_S390_VM_CRYPTO_ENABLE_APIE		4
26ba25
+#define KVM_S390_VM_CRYPTO_DISABLE_APIE		5
26ba25
 
26ba25
 /* kvm attributes for migration mode */
26ba25
 #define KVM_S390_VM_MIGRATION_STOP	0
26ba25
diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h
26ba25
index f3a9604..dcf4dc9 100644
26ba25
--- a/linux-headers/asm-x86/kvm.h
26ba25
+++ b/linux-headers/asm-x86/kvm.h
26ba25
@@ -360,5 +360,6 @@ struct kvm_sync_regs {
26ba25
 
26ba25
 #define KVM_X86_QUIRK_LINT0_REENABLED	(1 << 0)
26ba25
 #define KVM_X86_QUIRK_CD_NW_CLEARED	(1 << 1)
26ba25
+#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE	(1 << 2)
26ba25
 
26ba25
 #endif /* _ASM_X86_KVM_H */
26ba25
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
26ba25
index 454a0f7..9d2e44d 100644
26ba25
--- a/linux-headers/linux/kvm.h
26ba25
+++ b/linux-headers/linux/kvm.h
26ba25
@@ -937,6 +937,9 @@ struct kvm_ppc_resize_hpt {
26ba25
 #define KVM_CAP_S390_BPB 152
26ba25
 #define KVM_CAP_GET_MSR_FEATURES 153
26ba25
 #define KVM_CAP_S390_HPAGE_1M 156
26ba25
+#define KVM_CAP_NESTED_STATE 157
26ba25
+#define KVM_CAP_ARM_INJECT_SERROR_ESR 158
26ba25
+#define KVM_CAP_MSR_PLATFORM_INFO 159
26ba25
 
26ba25
 #ifdef KVM_CAP_IRQ_ROUTING
26ba25
 
26ba25
diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h
26ba25
index 3a0a305..25c7b7d 100644
26ba25
--- a/linux-headers/linux/vfio.h
26ba25
+++ b/linux-headers/linux/vfio.h
26ba25
@@ -200,6 +200,7 @@ struct vfio_device_info {
26ba25
 #define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2)	/* vfio-platform device */
26ba25
 #define VFIO_DEVICE_FLAGS_AMBA  (1 << 3)	/* vfio-amba device */
26ba25
 #define VFIO_DEVICE_FLAGS_CCW	(1 << 4)	/* vfio-ccw device */
26ba25
+#define VFIO_DEVICE_FLAGS_AP	(1 << 5)	/* vfio-ap device */
26ba25
 	__u32	num_regions;	/* Max region index + 1 */
26ba25
 	__u32	num_irqs;	/* Max IRQ index + 1 */
26ba25
 };
26ba25
@@ -215,6 +216,7 @@ struct vfio_device_info {
26ba25
 #define VFIO_DEVICE_API_PLATFORM_STRING		"vfio-platform"
26ba25
 #define VFIO_DEVICE_API_AMBA_STRING		"vfio-amba"
26ba25
 #define VFIO_DEVICE_API_CCW_STRING		"vfio-ccw"
26ba25
+#define VFIO_DEVICE_API_AP_STRING		"vfio-ap"
26ba25
 
26ba25
 /**
26ba25
  * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
26ba25
diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h
26ba25
index e336395..3421624 100644
26ba25
--- a/linux-headers/linux/vhost.h
26ba25
+++ b/linux-headers/linux/vhost.h
26ba25
@@ -160,6 +160,14 @@ struct vhost_memory {
26ba25
 #define VHOST_GET_VRING_BUSYLOOP_TIMEOUT _IOW(VHOST_VIRTIO, 0x24,	\
26ba25
 					 struct vhost_vring_state)
26ba25
 
26ba25
+/* Set or get vhost backend capability */
26ba25
+
26ba25
+/* Use message type V2 */
26ba25
+#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1
26ba25
+
26ba25
+#define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)
26ba25
+#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
26ba25
+
26ba25
 /* VHOST_NET specific defines */
26ba25
 
26ba25
 /* Attach virtio net ring to a raw socket, or tap device.
26ba25
-- 
26ba25
1.8.3.1
26ba25