Commit 24a31426 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

update Linux headers from kvm/next 



This is kvm.git commit 05ff30bb56c6b3d3000519d6e02ed35678ddae3b.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3bbf5723

include/standard-headers/linux/virtio_ring.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) 
}



/* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */

/* Assuming a given event_idx value from the other size, if

/* Assuming a given event_idx value from the other side, if

 * we have just incremented index from old to new_idx,

 * should we trigger an event? */

static inline int vring_need_event(uint16_t event_idx, uint16_t new_idx, uint16_t old)

linux-headers/asm-x86/kvm.h

+13 −1
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ struct kvm_ioapic_state { 
#define KVM_IRQCHIP_IOAPIC       2

#define KVM_NR_IRQCHIPS          3



#define KVM_RUN_X86_SMM		 (1 << 0)



/* for KVM_GET_REGS and KVM_SET_REGS */

struct kvm_regs {

	/* out (KVM_GET_REGS) / in (KVM_SET_REGS) */
@@ -281,6 +283,7 @@ struct kvm_reinject_control { 
#define KVM_VCPUEVENT_VALID_NMI_PENDING	0x00000001

#define KVM_VCPUEVENT_VALID_SIPI_VECTOR	0x00000002

#define KVM_VCPUEVENT_VALID_SHADOW	0x00000004

#define KVM_VCPUEVENT_VALID_SMM		0x00000008



/* Interrupt shadow states */

#define KVM_X86_SHADOW_INT_MOV_SS	0x01
@@ -309,7 +312,13 @@ struct kvm_vcpu_events { 
	} nmi;

	__u32 sipi_vector;

	__u32 flags;

	__u32 reserved[10];

	struct {

		__u8 smm;

		__u8 pending;

		__u8 smm_inside_nmi;

		__u8 latched_init;

	} smi;

	__u32 reserved[9];

};



/* for KVM_GET/SET_DEBUGREGS */
@@ -345,4 +354,7 @@ struct kvm_xcrs { 
struct kvm_sync_regs {

};



#define KVM_QUIRK_LINT0_REENABLED	(1 << 0)

#define KVM_QUIRK_CD_NW_CLEARED		(1 << 1)



#endif /* _ASM_X86_KVM_H */

linux-headers/linux/kvm.h

+6 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ struct kvm_run { 
	__u32 exit_reason;

	__u8 ready_for_interrupt_injection;

	__u8 if_flag;

	__u8 padding2[2];

	__u16 flags;



	/* in (pre_kvm_run), out (post_kvm_run) */

	__u64 cr8;
@@ -814,6 +814,9 @@ struct kvm_ppc_smmu_info { 
#define KVM_CAP_S390_INJECT_IRQ 113

#define KVM_CAP_S390_IRQ_STATE 114

#define KVM_CAP_PPC_HWRNG 115

#define KVM_CAP_DISABLE_QUIRKS 116

#define KVM_CAP_X86_SMM 117

#define KVM_CAP_MULTI_ADDRESS_SPACE 118



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1199,6 +1202,8 @@ struct kvm_s390_ucas_mapping { 
/* Available with KVM_CAP_S390_IRQ_STATE */

#define KVM_S390_SET_IRQ_STATE	  _IOW(KVMIO, 0xb5, struct kvm_s390_irq_state)

#define KVM_S390_GET_IRQ_STATE	  _IOW(KVMIO, 0xb6, struct kvm_s390_irq_state)

/* Available with KVM_CAP_X86_SMM */

#define KVM_SMI                   _IO(KVMIO,   0xb7)



#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)

#define KVM_DEV_ASSIGN_PCI_2_3		(1 << 1)