Commit 651682dc authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Anthony Liguori
Browse files

linux-headers: update to 3.6-rc3 



Update linux-headers to version present in Linux 3.6-rc3.
Header asm-x96_64/kvm_para.h update is needed for the new PV EOI
feature.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent ef8621b1

linux-headers/asm-s390/kvm.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __LINUX_KVM_S390_H

#define __LINUX_KVM_S390_H

/*

 * asm-s390/kvm.h - KVM s390 specific structures and definitions

 * KVM s390 specific structures and definitions

 *

 * Copyright IBM Corp. 2008

 *

linux-headers/asm-s390/kvm_para.h

+1 −1
Original line number Diff line number Diff line 
/*

 * asm-s390/kvm_para.h - definition for paravirtual devices on s390

 * definition for paravirtual devices on s390

 *

 * Copyright IBM Corp. 2008

 *

linux-headers/asm-x86/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
/* Select x86 specific features in <linux/kvm.h> */

#define __KVM_HAVE_PIT

#define __KVM_HAVE_IOAPIC

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_DEVICE_ASSIGNMENT

#define __KVM_HAVE_MSI

#define __KVM_HAVE_USER_NMI

linux-headers/asm-x86/kvm_para.h

+7 −0
Original line number Diff line number Diff line
@@ -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 */

linux-headers/linux/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ struct kvm_ppc_smmu_info { 
#define KVM_CAP_SIGNAL_MSI 77

#define KVM_CAP_PPC_GET_SMMU_INFO 78

#define KVM_CAP_S390_COW 79

#define KVM_CAP_PPC_ALLOC_HTAB 80



#ifdef KVM_CAP_IRQ_ROUTING
@@ -828,6 +829,8 @@ struct kvm_s390_ucas_mapping { 
#define KVM_SIGNAL_MSI            _IOW(KVMIO,  0xa5, struct kvm_msi)

/* Available with KVM_CAP_PPC_GET_SMMU_INFO */

#define KVM_PPC_GET_SMMU_INFO	  _IOR(KVMIO,  0xa6, struct kvm_ppc_smmu_info)

/* Available with KVM_CAP_PPC_ALLOC_HTAB */

#define KVM_PPC_ALLOCATE_HTAB	  _IOWR(KVMIO, 0xa7, __u32)



/*

 * ioctls for vcpu fds