Patchwork [for-1.2,1/2] linux-headers: update asm/kvm_para.h to 3.6

login
register
mail settings
Submitter Michael S. Tsirkin
Date Aug. 26, 2012, 3:59 p.m.
Message ID <ec54fac95b3ac09e669ac5c30f2231c280942e83.1345996760.git.mst@redhat.com>
Download mbox | patch
Permalink /patch/180070/
State New
Headers show

Comments

Michael S. Tsirkin - Aug. 26, 2012, 3:59 p.m.
Update asm-x96/kvm_para.h to version present in Linux 3.6.
This is needed for the new PV EOI feature.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 linux-headers/asm-x86/kvm_para.h | 7 +++++++
 1 file changed, 7 insertions(+)
Jan Kiszka - Aug. 27, 2012, 6:22 a.m.
On 2012-08-26 17:59, Michael S. Tsirkin wrote:
> Update asm-x96/kvm_para.h to version present in Linux 3.6.

Nope, we have update-linux-headers.sh for this. Just run it again
3.6-rcX, grab the result, and mention the source (release version or
kvm.git hash).

Jan

> This is needed for the new PV EOI feature.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  linux-headers/asm-x86/kvm_para.h | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/linux-headers/asm-x86/kvm_para.h b/linux-headers/asm-x86/kvm_para.h
> index f2ac46a..a1c3d72 100644
> --- a/linux-headers/asm-x86/kvm_para.h
> +++ b/linux-headers/asm-x86/kvm_para.h
> @@ -22,6 +22,7 @@
>  #define KVM_FEATURE_CLOCKSOURCE2        3
>  #define KVM_FEATURE_ASYNC_PF		4
>  #define KVM_FEATURE_STEAL_TIME		5
> +#define KVM_FEATURE_PV_EOI		6
>  
>  /* 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.
> @@ -37,6 +38,7 @@
>  #define MSR_KVM_SYSTEM_TIME_NEW 0x4b564d01
>  #define MSR_KVM_ASYNC_PF_EN 0x4b564d02
>  #define MSR_KVM_STEAL_TIME  0x4b564d03
> +#define MSR_KVM_PV_EOI_EN      0x4b564d04
>  
>  struct kvm_steal_time {
>  	__u64 steal;
> @@ -89,5 +91,10 @@ struct kvm_vcpu_pv_apf_data {
>  	__u32 enabled;
>  };
>  
> +#define KVM_PV_EOI_BIT 0
> +#define KVM_PV_EOI_MASK (0x1 << KVM_PV_EOI_BIT)
> +#define KVM_PV_EOI_ENABLED KVM_PV_EOI_MASK
> +#define KVM_PV_EOI_DISABLED 0x0
> +
>  
>  #endif /* _ASM_X86_KVM_PARA_H */
>

Patch

diff --git a/linux-headers/asm-x86/kvm_para.h b/linux-headers/asm-x86/kvm_para.h
index f2ac46a..a1c3d72 100644
--- a/linux-headers/asm-x86/kvm_para.h
+++ b/linux-headers/asm-x86/kvm_para.h
@@ -22,6 +22,7 @@ 
 #define KVM_FEATURE_CLOCKSOURCE2        3
 #define KVM_FEATURE_ASYNC_PF		4
 #define KVM_FEATURE_STEAL_TIME		5
+#define KVM_FEATURE_PV_EOI		6
 
 /* 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.
@@ -37,6 +38,7 @@ 
 #define MSR_KVM_SYSTEM_TIME_NEW 0x4b564d01
 #define MSR_KVM_ASYNC_PF_EN 0x4b564d02
 #define MSR_KVM_STEAL_TIME  0x4b564d03
+#define MSR_KVM_PV_EOI_EN      0x4b564d04
 
 struct kvm_steal_time {
 	__u64 steal;
@@ -89,5 +91,10 @@  struct kvm_vcpu_pv_apf_data {
 	__u32 enabled;
 };
 
+#define KVM_PV_EOI_BIT 0
+#define KVM_PV_EOI_MASK (0x1 << KVM_PV_EOI_BIT)
+#define KVM_PV_EOI_ENABLED KVM_PV_EOI_MASK
+#define KVM_PV_EOI_DISABLED 0x0
+
 
 #endif /* _ASM_X86_KVM_PARA_H */