cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 4ab077cab6755cb2bad369b769a5ba077ae3264e Mon Sep 17 00:00:00 2001
218e99
From: Andrew Jones <drjones@redhat.com>
218e99
Date: Tue, 24 Sep 2013 13:08:52 +0200
218e99
Subject: [PATCH 03/11] linux-headers: update to kernel-3.10.0-26.el7
218e99
218e99
RH-Author: Andrew Jones <drjones@redhat.com>
218e99
Message-id: <1380028133-15578-2-git-send-email-drjones@redhat.com>
218e99
Patchwork-id: 54524
218e99
O-Subject: [RHEL7.0 qemu-kvm PATCH 1/2] linux-headers: update to kernel-3.10.0-26.el7
218e99
Bugzilla: 1008987
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Radim Krcmar <rkrcmar@redhat.com>
218e99
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
218e99
218e99
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1008987
218e99
218e99
Signed-off-by: Andrew Jones <drjones@redhat.com>
218e99
---
218e99
 linux-headers/asm-mips/kvm.h     | 81 +++++++++++++++++++---------------------
218e99
 linux-headers/asm-x86/kvm_para.h |  1 +
218e99
 linux-headers/linux/kvm.h        |  1 +
218e99
 linux-headers/linux/kvm_para.h   |  1 +
218e99
 linux-headers/linux/vfio.h       |  8 +++-
218e99
 5 files changed, 48 insertions(+), 44 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 linux-headers/asm-mips/kvm.h     |   81 ++++++++++++++++++-------------------
218e99
 linux-headers/asm-x86/kvm_para.h |    1 +
218e99
 linux-headers/linux/kvm.h        |    1 +
218e99
 linux-headers/linux/kvm_para.h   |    1 +
218e99
 linux-headers/linux/vfio.h       |    8 +++-
218e99
 5 files changed, 48 insertions(+), 44 deletions(-)
218e99
218e99
diff --git a/linux-headers/asm-mips/kvm.h b/linux-headers/asm-mips/kvm.h
218e99
index 3f424f5..f09ff5a 100644
218e99
--- a/linux-headers/asm-mips/kvm.h
218e99
+++ b/linux-headers/asm-mips/kvm.h
218e99
@@ -58,56 +58,53 @@ struct kvm_fpu {
218e99
  *  bits[2..0]   - Register 'sel' index.
218e99
  *  bits[7..3]   - Register 'rd'  index.
218e99
  *  bits[15..8]  - Must be zero.
218e99
- *  bits[63..16] - 1 -> CP0 registers.
218e99
+ *  bits[31..16] - 1 -> CP0 registers.
218e99
+ *  bits[51..32] - Must be zero.
218e99
+ *  bits[63..52] - As per linux/kvm.h
218e99
  *
218e99
  * Other sets registers may be added in the future.  Each set would
218e99
- * have its own identifier in bits[63..16].
218e99
- *
218e99
- * The addr field of struct kvm_one_reg must point to an aligned
218e99
- * 64-bit wide location.  For registers that are narrower than
218e99
- * 64-bits, the value is stored in the low order bits of the location,
218e99
- * and sign extended to 64-bits.
218e99
+ * have its own identifier in bits[31..16].
218e99
  *
218e99
  * The registers defined in struct kvm_regs are also accessible, the
218e99
  * id values for these are below.
218e99
  */
218e99
 
218e99
-#define KVM_REG_MIPS_R0 0
218e99
-#define KVM_REG_MIPS_R1 1
218e99
-#define KVM_REG_MIPS_R2 2
218e99
-#define KVM_REG_MIPS_R3 3
218e99
-#define KVM_REG_MIPS_R4 4
218e99
-#define KVM_REG_MIPS_R5 5
218e99
-#define KVM_REG_MIPS_R6 6
218e99
-#define KVM_REG_MIPS_R7 7
218e99
-#define KVM_REG_MIPS_R8 8
218e99
-#define KVM_REG_MIPS_R9 9
218e99
-#define KVM_REG_MIPS_R10 10
218e99
-#define KVM_REG_MIPS_R11 11
218e99
-#define KVM_REG_MIPS_R12 12
218e99
-#define KVM_REG_MIPS_R13 13
218e99
-#define KVM_REG_MIPS_R14 14
218e99
-#define KVM_REG_MIPS_R15 15
218e99
-#define KVM_REG_MIPS_R16 16
218e99
-#define KVM_REG_MIPS_R17 17
218e99
-#define KVM_REG_MIPS_R18 18
218e99
-#define KVM_REG_MIPS_R19 19
218e99
-#define KVM_REG_MIPS_R20 20
218e99
-#define KVM_REG_MIPS_R21 21
218e99
-#define KVM_REG_MIPS_R22 22
218e99
-#define KVM_REG_MIPS_R23 23
218e99
-#define KVM_REG_MIPS_R24 24
218e99
-#define KVM_REG_MIPS_R25 25
218e99
-#define KVM_REG_MIPS_R26 26
218e99
-#define KVM_REG_MIPS_R27 27
218e99
-#define KVM_REG_MIPS_R28 28
218e99
-#define KVM_REG_MIPS_R29 29
218e99
-#define KVM_REG_MIPS_R30 30
218e99
-#define KVM_REG_MIPS_R31 31
218e99
+#define KVM_REG_MIPS_R0 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 0)
218e99
+#define KVM_REG_MIPS_R1 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 1)
218e99
+#define KVM_REG_MIPS_R2 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 2)
218e99
+#define KVM_REG_MIPS_R3 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 3)
218e99
+#define KVM_REG_MIPS_R4 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 4)
218e99
+#define KVM_REG_MIPS_R5 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 5)
218e99
+#define KVM_REG_MIPS_R6 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 6)
218e99
+#define KVM_REG_MIPS_R7 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 7)
218e99
+#define KVM_REG_MIPS_R8 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 8)
218e99
+#define KVM_REG_MIPS_R9 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 9)
218e99
+#define KVM_REG_MIPS_R10 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 10)
218e99
+#define KVM_REG_MIPS_R11 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 11)
218e99
+#define KVM_REG_MIPS_R12 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 12)
218e99
+#define KVM_REG_MIPS_R13 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 13)
218e99
+#define KVM_REG_MIPS_R14 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 14)
218e99
+#define KVM_REG_MIPS_R15 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 15)
218e99
+#define KVM_REG_MIPS_R16 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 16)
218e99
+#define KVM_REG_MIPS_R17 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 17)
218e99
+#define KVM_REG_MIPS_R18 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 18)
218e99
+#define KVM_REG_MIPS_R19 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 19)
218e99
+#define KVM_REG_MIPS_R20 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 20)
218e99
+#define KVM_REG_MIPS_R21 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 21)
218e99
+#define KVM_REG_MIPS_R22 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 22)
218e99
+#define KVM_REG_MIPS_R23 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 23)
218e99
+#define KVM_REG_MIPS_R24 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 24)
218e99
+#define KVM_REG_MIPS_R25 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 25)
218e99
+#define KVM_REG_MIPS_R26 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 26)
218e99
+#define KVM_REG_MIPS_R27 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 27)
218e99
+#define KVM_REG_MIPS_R28 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 28)
218e99
+#define KVM_REG_MIPS_R29 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 29)
218e99
+#define KVM_REG_MIPS_R30 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 30)
218e99
+#define KVM_REG_MIPS_R31 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 31)
218e99
 
218e99
-#define KVM_REG_MIPS_HI 32
218e99
-#define KVM_REG_MIPS_LO 33
218e99
-#define KVM_REG_MIPS_PC 34
218e99
+#define KVM_REG_MIPS_HI (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 32)
218e99
+#define KVM_REG_MIPS_LO (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 33)
218e99
+#define KVM_REG_MIPS_PC (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 34)
218e99
 
218e99
 /*
218e99
  * KVM MIPS specific structures and definitions
218e99
diff --git a/linux-headers/asm-x86/kvm_para.h b/linux-headers/asm-x86/kvm_para.h
218e99
index a1c3d72..e41c5c1 100644
218e99
--- a/linux-headers/asm-x86/kvm_para.h
218e99
+++ b/linux-headers/asm-x86/kvm_para.h
218e99
@@ -23,6 +23,7 @@
218e99
 #define KVM_FEATURE_ASYNC_PF		4
218e99
 #define KVM_FEATURE_STEAL_TIME		5
218e99
 #define KVM_FEATURE_PV_EOI		6
218e99
+#define KVM_FEATURE_PV_UNHALT		7
218e99
 
218e99
 /* The last 8 bits are used to indicate how to interpret the flags field
218e99
  * in pvclock structure. If no bits are set, all flags are ignored.
218e99
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
218e99
index c614070..01bf15b 100644
218e99
--- a/linux-headers/linux/kvm.h
218e99
+++ b/linux-headers/linux/kvm.h
218e99
@@ -783,6 +783,7 @@ struct kvm_dirty_tlb {
218e99
 #define KVM_REG_IA64		0x3000000000000000ULL
218e99
 #define KVM_REG_ARM		0x4000000000000000ULL
218e99
 #define KVM_REG_S390		0x5000000000000000ULL
218e99
+#define KVM_REG_MIPS		0x7000000000000000ULL
218e99
 
218e99
 #define KVM_REG_SIZE_SHIFT	52
218e99
 #define KVM_REG_SIZE_MASK	0x00f0000000000000ULL
218e99
diff --git a/linux-headers/linux/kvm_para.h b/linux-headers/linux/kvm_para.h
218e99
index 7bdcf93..2dff783 100644
218e99
--- a/linux-headers/linux/kvm_para.h
218e99
+++ b/linux-headers/linux/kvm_para.h
218e99
@@ -19,6 +19,7 @@
218e99
 #define KVM_HC_MMU_OP			2
218e99
 #define KVM_HC_FEATURES			3
218e99
 #define KVM_HC_PPC_MAP_MAGIC_PAGE	4
218e99
+#define KVM_HC_KICK_CPU			5
218e99
 
218e99
 /*
218e99
  * hypercalls use architecture specific
218e99
diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h
218e99
index 7ec1864..9e6df92 100644
218e99
--- a/linux-headers/linux/vfio.h
218e99
+++ b/linux-headers/linux/vfio.h
218e99
@@ -361,10 +361,14 @@ struct vfio_iommu_type1_dma_map {
218e99
 #define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)
218e99
 
218e99
 /**
218e99
- * VFIO_IOMMU_UNMAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 14, struct vfio_dma_unmap)
218e99
+ * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14,
218e99
+ *							struct vfio_dma_unmap)
218e99
  *
218e99
  * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.
218e99
- * Caller sets argsz.
218e99
+ * Caller sets argsz.  The actual unmapped size is returned in the size
218e99
+ * field.  No guarantee is made to the user that arbitrary unmaps of iova
218e99
+ * or size different from those used in the original mapping call will
218e99
+ * succeed.
218e99
  */
218e99
 struct vfio_iommu_type1_dma_unmap {
218e99
 	__u32	argsz;
218e99
-- 
218e99
1.7.1
218e99