Commit fa681181 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: selftests: sync uapi/linux/kvm.h with Linux header 



KVM_CAP_XSAVE2 is out of sync due to a conflict.  Copy the whole
file while at it.

Reported-by: default avatarYang Zhong <yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d5ad5b1c

tools/include/uapi/linux/kvm.h

+16 −3
Original line number Diff line number Diff line
@@ -1131,7 +1131,8 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204

#define KVM_CAP_ARM_MTE 205

#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206

#define KVM_CAP_XSAVE2 207

#define KVM_CAP_VM_GPA_BITS 207

#define KVM_CAP_XSAVE2 208



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1163,11 +1164,20 @@ struct kvm_irq_routing_hv_sint { 
	__u32 sint;

};



struct kvm_irq_routing_xen_evtchn {

	__u32 port;

	__u32 vcpu;

	__u32 priority;

};



#define KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL ((__u32)(-1))



/* gsi routing entry types */

#define KVM_IRQ_ROUTING_IRQCHIP 1

#define KVM_IRQ_ROUTING_MSI 2

#define KVM_IRQ_ROUTING_S390_ADAPTER 3

#define KVM_IRQ_ROUTING_HV_SINT 4

#define KVM_IRQ_ROUTING_XEN_EVTCHN 5



struct kvm_irq_routing_entry {

	__u32 gsi;
@@ -1179,6 +1189,7 @@ struct kvm_irq_routing_entry { 
		struct kvm_irq_routing_msi msi;

		struct kvm_irq_routing_s390_adapter adapter;

		struct kvm_irq_routing_hv_sint hv_sint;

		struct kvm_irq_routing_xen_evtchn xen_evtchn;

		__u32 pad[8];

	} u;

};
@@ -1209,6 +1220,7 @@ struct kvm_x86_mce { 
#define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL	(1 << 1)

#define KVM_XEN_HVM_CONFIG_SHARED_INFO		(1 << 2)

#define KVM_XEN_HVM_CONFIG_RUNSTATE		(1 << 3)

#define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL	(1 << 4)



struct kvm_xen_hvm_config {

	__u32 flags;
@@ -1552,8 +1564,6 @@ struct kvm_s390_ucas_mapping { 
/* Available with KVM_CAP_XSAVE */

#define KVM_GET_XSAVE		  _IOR(KVMIO,  0xa4, struct kvm_xsave)

#define KVM_SET_XSAVE		  _IOW(KVMIO,  0xa5, struct kvm_xsave)

/* Available with KVM_CAP_XSAVE2 */

#define KVM_GET_XSAVE2		  _IOR(KVMIO,  0xcf, struct kvm_xsave)

/* Available with KVM_CAP_XCRS */

#define KVM_GET_XCRS		  _IOR(KVMIO,  0xa6, struct kvm_xcrs)

#define KVM_SET_XCRS		  _IOW(KVMIO,  0xa7, struct kvm_xcrs)
@@ -1613,6 +1623,9 @@ struct kvm_enc_region { 
#define KVM_S390_NORMAL_RESET	_IO(KVMIO,   0xc3)

#define KVM_S390_CLEAR_RESET	_IO(KVMIO,   0xc4)



/* Available with KVM_CAP_XSAVE2 */

#define KVM_GET_XSAVE2		  _IOR(KVMIO,  0xcf, struct kvm_xsave)



struct kvm_s390_pv_sec_parm {

	__u64 origin;

	__u64 length;