From 4ab077cab6755cb2bad369b769a5ba077ae3264e Mon Sep 17 00:00:00 2001

From: Andrew Jones <drjones@redhat.com>

Date: Tue, 24 Sep 2013 13:08:52 +0200

Subject: [PATCH 03/11] linux-headers: update to kernel-3.10.0-26.el7

RH-Author: Andrew Jones <drjones@redhat.com>

Message-id: <1380028133-15578-2-git-send-email-drjones@redhat.com>

Patchwork-id: 54524

O-Subject: [RHEL7.0 qemu-kvm PATCH 1/2] linux-headers: update to kernel-3.10.0-26.el7

Bugzilla: 1008987

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Radim Krcmar <rkrcmar@redhat.com>

RH-Acked-by: Igor Mammedov <imammedo@redhat.com>

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1008987

Signed-off-by: Andrew Jones <drjones@redhat.com>

---

 linux-headers/asm-mips/kvm.h     | 81 +++++++++++++++++++---------------------

 linux-headers/asm-x86/kvm_para.h |  1 +

 linux-headers/linux/kvm.h        |  1 +

 linux-headers/linux/kvm_para.h   |  1 +

 linux-headers/linux/vfio.h       |  8 +++-

 5 files changed, 48 insertions(+), 44 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 linux-headers/asm-mips/kvm.h     |   81 ++++++++++++++++++-------------------

 linux-headers/asm-x86/kvm_para.h |    1 +

 linux-headers/linux/kvm.h        |    1 +

 linux-headers/linux/kvm_para.h   |    1 +

 linux-headers/linux/vfio.h       |    8 +++-

 5 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/linux-headers/asm-mips/kvm.h b/linux-headers/asm-mips/kvm.h

index 3f424f5..f09ff5a 100644

--- a/linux-headers/asm-mips/kvm.h

+++ b/linux-headers/asm-mips/kvm.h

@@ -58,56 +58,53 @@ struct kvm_fpu {

  *  bits[2..0]   - Register 'sel' index.

  *  bits[7..3]   - Register 'rd'  index.

  *  bits[15..8]  - Must be zero.

- *  bits[63..16] - 1 -> CP0 registers.

+ *  bits[31..16] - 1 -> CP0 registers.

+ *  bits[51..32] - Must be zero.

+ *  bits[63..52] - As per linux/kvm.h

  *

  * Other sets registers may be added in the future.  Each set would

- * have its own identifier in bits[63..16].

- *

- * The addr field of struct kvm_one_reg must point to an aligned

- * 64-bit wide location.  For registers that are narrower than

- * 64-bits, the value is stored in the low order bits of the location,

- * and sign extended to 64-bits.

+ * have its own identifier in bits[31..16].

  *

  * The registers defined in struct kvm_regs are also accessible, the

  * id values for these are below.

  */

-#define KVM_REG_MIPS_R0 0

-#define KVM_REG_MIPS_R1 1

-#define KVM_REG_MIPS_R2 2

-#define KVM_REG_MIPS_R3 3

-#define KVM_REG_MIPS_R4 4

-#define KVM_REG_MIPS_R5 5

-#define KVM_REG_MIPS_R6 6

-#define KVM_REG_MIPS_R7 7

-#define KVM_REG_MIPS_R8 8

-#define KVM_REG_MIPS_R9 9

-#define KVM_REG_MIPS_R10 10

-#define KVM_REG_MIPS_R11 11

-#define KVM_REG_MIPS_R12 12

-#define KVM_REG_MIPS_R13 13

-#define KVM_REG_MIPS_R14 14

-#define KVM_REG_MIPS_R15 15

-#define KVM_REG_MIPS_R16 16

-#define KVM_REG_MIPS_R17 17

-#define KVM_REG_MIPS_R18 18

-#define KVM_REG_MIPS_R19 19

-#define KVM_REG_MIPS_R20 20

-#define KVM_REG_MIPS_R21 21

-#define KVM_REG_MIPS_R22 22

-#define KVM_REG_MIPS_R23 23

-#define KVM_REG_MIPS_R24 24

-#define KVM_REG_MIPS_R25 25

-#define KVM_REG_MIPS_R26 26

-#define KVM_REG_MIPS_R27 27

-#define KVM_REG_MIPS_R28 28

-#define KVM_REG_MIPS_R29 29

-#define KVM_REG_MIPS_R30 30

-#define KVM_REG_MIPS_R31 31

+#define KVM_REG_MIPS_R0 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 0)

+#define KVM_REG_MIPS_R1 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 1)

+#define KVM_REG_MIPS_R2 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 2)

+#define KVM_REG_MIPS_R3 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 3)

+#define KVM_REG_MIPS_R4 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 4)

+#define KVM_REG_MIPS_R5 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 5)

+#define KVM_REG_MIPS_R6 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 6)

+#define KVM_REG_MIPS_R7 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 7)

+#define KVM_REG_MIPS_R8 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 8)

+#define KVM_REG_MIPS_R9 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 9)

+#define KVM_REG_MIPS_R10 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 10)

+#define KVM_REG_MIPS_R11 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 11)

+#define KVM_REG_MIPS_R12 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 12)

+#define KVM_REG_MIPS_R13 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 13)

+#define KVM_REG_MIPS_R14 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 14)

+#define KVM_REG_MIPS_R15 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 15)

+#define KVM_REG_MIPS_R16 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 16)

+#define KVM_REG_MIPS_R17 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 17)

+#define KVM_REG_MIPS_R18 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 18)

+#define KVM_REG_MIPS_R19 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 19)

+#define KVM_REG_MIPS_R20 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 20)

+#define KVM_REG_MIPS_R21 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 21)

+#define KVM_REG_MIPS_R22 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 22)

+#define KVM_REG_MIPS_R23 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 23)

+#define KVM_REG_MIPS_R24 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 24)

+#define KVM_REG_MIPS_R25 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 25)

+#define KVM_REG_MIPS_R26 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 26)

+#define KVM_REG_MIPS_R27 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 27)

+#define KVM_REG_MIPS_R28 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 28)

+#define KVM_REG_MIPS_R29 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 29)

+#define KVM_REG_MIPS_R30 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 30)

+#define KVM_REG_MIPS_R31 (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 31)

-#define KVM_REG_MIPS_HI 32

-#define KVM_REG_MIPS_LO 33

-#define KVM_REG_MIPS_PC 34

+#define KVM_REG_MIPS_HI (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 32)

+#define KVM_REG_MIPS_LO (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 33)

+#define KVM_REG_MIPS_PC (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 34)

 /*

  * KVM MIPS specific structures and definitions

diff --git a/linux-headers/asm-x86/kvm_para.h b/linux-headers/asm-x86/kvm_para.h

index a1c3d72..e41c5c1 100644

--- a/linux-headers/asm-x86/kvm_para.h

+++ b/linux-headers/asm-x86/kvm_para.h

@@ -23,6 +23,7 @@

 #define KVM_FEATURE_ASYNC_PF		4

 #define KVM_FEATURE_STEAL_TIME		5

 #define KVM_FEATURE_PV_EOI		6

+#define KVM_FEATURE_PV_UNHALT		7

 /* The last 8 bits are used to indicate how to interpret the flags field

  * in pvclock structure. If no bits are set, all flags are ignored.

diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h

index c614070..01bf15b 100644

--- a/linux-headers/linux/kvm.h

+++ b/linux-headers/linux/kvm.h

@@ -783,6 +783,7 @@ struct kvm_dirty_tlb {

 #define KVM_REG_IA64		0x3000000000000000ULL

 #define KVM_REG_ARM		0x4000000000000000ULL

 #define KVM_REG_S390		0x5000000000000000ULL

+#define KVM_REG_MIPS		0x7000000000000000ULL

 #define KVM_REG_SIZE_SHIFT	52

 #define KVM_REG_SIZE_MASK	0x00f0000000000000ULL

diff --git a/linux-headers/linux/kvm_para.h b/linux-headers/linux/kvm_para.h

index 7bdcf93..2dff783 100644

--- a/linux-headers/linux/kvm_para.h

+++ b/linux-headers/linux/kvm_para.h

@@ -19,6 +19,7 @@

 #define KVM_HC_MMU_OP			2

 #define KVM_HC_FEATURES			3

 #define KVM_HC_PPC_MAP_MAGIC_PAGE	4

+#define KVM_HC_KICK_CPU			5

 /*

  * hypercalls use architecture specific

diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h

index 7ec1864..9e6df92 100644

--- a/linux-headers/linux/vfio.h

+++ b/linux-headers/linux/vfio.h

@@ -361,10 +361,14 @@ struct vfio_iommu_type1_dma_map {

 #define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)

 /**

- * VFIO_IOMMU_UNMAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 14, struct vfio_dma_unmap)

+ * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14,

+ *							struct vfio_dma_unmap)

  *

  * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.

- * Caller sets argsz.

+ * Caller sets argsz.  The actual unmapped size is returned in the size

+ * field.  No guarantee is made to the user that arbitrary unmaps of iova

+ * or size different from those used in the original mapping call will

+ * succeed.

  */

 struct vfio_iommu_type1_dma_unmap {

 	__u32	argsz;

-- 

1.7.1