tools arch kvm: Sync kvm headers with the kernel sources (c499d1f4) · Commits · 戴 / test

tools/arch/arm64/include/uapi/asm/kvm.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,13 @@ struct kvm_vcpu_events {
		KVM_REG_SIZE_U256 \| \
		((i) & (KVM_ARM64_SVE_MAX_SLICES - 1)))

		/*
		* Register values for KVM_REG_ARM64_SVE_ZREG(), KVM_REG_ARM64_SVE_PREG() and
		* KVM_REG_ARM64_SVE_FFR() are represented in memory in an endianness-
		* invariant layout which differs from the layout used for the FPSIMD
		* V-registers on big-endian systems: see sigcontext.h for more explanation.
		*/

		#define KVM_ARM64_SVE_VQ_MIN __SVE_VQ_MIN
		#define KVM_ARM64_SVE_VQ_MAX __SVE_VQ_MAX

+21 −10

Original line number	Diff line number	Diff line
		@@ -383,6 +383,9 @@ struct kvm_sync_regs {
		#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2)
		#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3)

		#define KVM_STATE_NESTED_FORMAT_VMX 0
		#define KVM_STATE_NESTED_FORMAT_SVM 1 /* unused */

		#define KVM_STATE_NESTED_GUEST_MODE 0x00000001
		#define KVM_STATE_NESTED_RUN_PENDING 0x00000002
		#define KVM_STATE_NESTED_EVMCS 0x00000004
		@@ -390,7 +393,14 @@ struct kvm_sync_regs {
		#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001
		#define KVM_STATE_NESTED_SMM_VMXON 0x00000002

		struct kvm_vmx_nested_state {
		#define KVM_STATE_NESTED_VMX_VMCS_SIZE 0x1000

		struct kvm_vmx_nested_state_data {
		__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
		__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
		};

		struct kvm_vmx_nested_state_hdr {
		__u64 vmxon_pa;
		__u64 vmcs12_pa;

		@@ -401,24 +411,25 @@ struct kvm_vmx_nested_state {

		/* for KVM_CAP_NESTED_STATE */
		struct kvm_nested_state {
		/* KVM_STATE_* flags */
		__u16 flags;

		/* 0 for VMX, 1 for SVM. */
		__u16 format;

		/* 128 for SVM, 128 + VMCS size for VMX. */
		__u32 size;

		union {
		/* VMXON, VMCS */
		struct kvm_vmx_nested_state vmx;
		struct kvm_vmx_nested_state_hdr vmx;

		/* Pad the header to 128 bytes. */
		__u8 pad[120];
		};
		} hdr;

		__u8 data[0];
		/*
		* Define data region as 0 bytes to preserve backwards-compatability
		* to old definition of kvm_nested_state in order to avoid changing
		* KVM_{GET,PUT}_NESTED_STATE ioctl values.
		*/
		union {
		struct kvm_vmx_nested_state_data vmx[0];
		} data;
		};

		#endif /* _ASM_X86_KVM_H */