Commit 716b8e4d authored by Alex Williamson's avatar Alex Williamson
Browse files

linux-headers: Update to 3.7-rc5 



update-linux-headers.sh script run against Linux tag v3.7-rc5

Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent f5022a13

linux-headers/asm-powerpc/kvm_para.h

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
 * Authors: Hollis Blanchard <hollisb@us.ibm.com>

 */



#ifndef __POWERPC_KVM_PARA_H__

#define __POWERPC_KVM_PARA_H__

#ifndef _UAPI__POWERPC_KVM_PARA_H__

#define _UAPI__POWERPC_KVM_PARA_H__



#include <linux/types.h>
@@ -87,4 +87,4 @@ struct kvm_vcpu_arch_shared { 
#define KVM_MAGIC_FEAT_MAS0_TO_SPRG7	(1 << 1)





#endif /* __POWERPC_KVM_PARA_H__ */
 
#endif /* _UAPI__POWERPC_KVM_PARA_H__ */

linux-headers/asm-s390/kvm_para.h

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

 * definition for paravirtual devices on s390

 * User API definitions for paravirtual devices on s390

 *

 * Copyright IBM Corp. 2008

 *
@@ -9,9 +9,3 @@ 
 *

 *    Author(s): Christian Borntraeger <borntraeger@de.ibm.com>

 */
 


#ifndef __S390_KVM_PARA_H

#define __S390_KVM_PARA_H





#endif /* __S390_KVM_PARA_H */

linux-headers/asm-x86/kvm.h

+17 −0
Original line number Diff line number Diff line
@@ -9,6 +9,22 @@ 
#include <linux/types.h>

#include <linux/ioctl.h>



#define DE_VECTOR 0

#define DB_VECTOR 1

#define BP_VECTOR 3

#define OF_VECTOR 4

#define BR_VECTOR 5

#define UD_VECTOR 6

#define NM_VECTOR 7

#define DF_VECTOR 8

#define TS_VECTOR 10

#define NP_VECTOR 11

#define SS_VECTOR 12

#define GP_VECTOR 13

#define PF_VECTOR 14

#define MF_VECTOR 16

#define MC_VECTOR 18



/* Select x86 specific features in <linux/kvm.h> */

#define __KVM_HAVE_PIT

#define __KVM_HAVE_IOAPIC
@@ -25,6 +41,7 @@ 
#define __KVM_HAVE_DEBUGREGS

#define __KVM_HAVE_XSAVE

#define __KVM_HAVE_XCRS

#define __KVM_HAVE_READONLY_MEM



/* Architectural interrupt line count. */

#define KVM_NR_INTERRUPTS 256

linux-headers/linux/kvm.h

+21 −4
Original line number Diff line number Diff line
@@ -101,9 +101,13 @@ struct kvm_userspace_memory_region { 
	__u64 userspace_addr; /* start of the userspace allocated memory */

};



/* for kvm_memory_region::flags */

#define KVM_MEM_LOG_DIRTY_PAGES  1UL

#define KVM_MEMSLOT_INVALID      (1UL << 1)

/*

 * The bit 0 ~ bit 15 of kvm_memory_region::flags are visible for userspace,

 * other bits are reserved for kvm internal use which are defined in

 * include/linux/kvm_host.h.

 */

#define KVM_MEM_LOG_DIRTY_PAGES	(1UL << 0)

#define KVM_MEM_READONLY	(1UL << 1)



/* for KVM_IRQ_LINE */

struct kvm_irq_level {
@@ -618,6 +622,10 @@ struct kvm_ppc_smmu_info { 
#define KVM_CAP_PPC_GET_SMMU_INFO 78

#define KVM_CAP_S390_COW 79

#define KVM_CAP_PPC_ALLOC_HTAB 80

#ifdef __KVM_HAVE_READONLY_MEM

#define KVM_CAP_READONLY_MEM 81

#endif

#define KVM_CAP_IRQFD_RESAMPLE 82



#ifdef KVM_CAP_IRQ_ROUTING
@@ -683,12 +691,21 @@ struct kvm_xen_hvm_config { 
#endif



#define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)

/*

 * Available with KVM_CAP_IRQFD_RESAMPLE

 *

 * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies

 * the irqfd to operate in resampling mode for level triggered interrupt

 * emlation.  See Documentation/virtual/kvm/api.txt.

 */

#define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)



struct kvm_irqfd {

	__u32 fd;

	__u32 gsi;

	__u32 flags;

	__u8  pad[20];

	__u32 resamplefd;

	__u8  pad[16];

};



struct kvm_clock_data {

linux-headers/linux/kvm_para.h

+3 −3
Original line number Diff line number Diff line 
#ifndef __LINUX_KVM_PARA_H

#define __LINUX_KVM_PARA_H

#ifndef _UAPI__LINUX_KVM_PARA_H

#define _UAPI__LINUX_KVM_PARA_H



/*

 * This header file provides a method for making a hypercall to the host
@@ -25,4 +25,4 @@ 
 */

#include <asm/kvm_para.h>



#endif /* __LINUX_KVM_PARA_H */
 
#endif /* _UAPI__LINUX_KVM_PARA_H */