Commit 4f265607 authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

linux-headers: update to 3.12-rc1 



Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 787aaf57

linux-headers/asm-x86/kvm_para.h

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

linux-headers/linux/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ struct kvm_ppc_smmu_info { 
#define KVM_CAP_PPC_RTAS 91

#define KVM_CAP_IRQ_XICS 92

#define KVM_CAP_ARM_EL1_32BIT 93

#define KVM_CAP_SPAPR_MULTITCE 94



#ifdef KVM_CAP_IRQ_ROUTING

linux-headers/linux/kvm_para.h

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

linux-headers/linux/vfio.h

+38 −0
Original line number Diff line number Diff line
@@ -324,6 +324,44 @@ enum { 
	VFIO_PCI_NUM_IRQS

};



/**

 * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IORW(VFIO_TYPE, VFIO_BASE + 12,

 *					      struct vfio_pci_hot_reset_info)

 *

 * Return: 0 on success, -errno on failure:

 *	-enospc = insufficient buffer, -enodev = unsupported for device.

 */

struct vfio_pci_dependent_device {

	__u32	group_id;

	__u16	segment;

	__u8	bus;

	__u8	devfn; /* Use PCI_SLOT/PCI_FUNC */

};



struct vfio_pci_hot_reset_info {

	__u32	argsz;

	__u32	flags;

	__u32	count;

	struct vfio_pci_dependent_device	devices[];

};



#define VFIO_DEVICE_GET_PCI_HOT_RESET_INFO	_IO(VFIO_TYPE, VFIO_BASE + 12)



/**

 * VFIO_DEVICE_PCI_HOT_RESET - _IOW(VFIO_TYPE, VFIO_BASE + 13,

 *				    struct vfio_pci_hot_reset)

 *

 * Return: 0 on success, -errno on failure.

 */

struct vfio_pci_hot_reset {

	__u32	argsz;

	__u32	flags;

	__u32	count;

	__s32	group_fds[];

};



#define VFIO_DEVICE_PCI_HOT_RESET	_IO(VFIO_TYPE, VFIO_BASE + 13)



/* -------- API for Type1 VFIO IOMMU -------- */



/**