Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eca70fc5 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Avi Kivity
Browse files

KVM: VMX: move ASM_VMX_* definitions from asm/kvm_host.h to asm/vmx.h 



Those definitions will be used by code outside KVM, so move it outside
of a KVM-specific source file.

Those definitions are used only on kvm/vmx.c, that already includes
asm/vmx.h, so they can be moved safely.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c2cedf7b

arch/x86/include/asm/kvm_host.h

+0 −12
Original line number Diff line number Diff line
@@ -714,18 +714,6 @@ static inline void kvm_inject_gp(struct kvm_vcpu *vcpu, u32 error_code) 
	kvm_queue_exception_e(vcpu, GP_VECTOR, error_code);

}



#define ASM_VMX_VMCLEAR_RAX       ".byte 0x66, 0x0f, 0xc7, 0x30"

#define ASM_VMX_VMLAUNCH          ".byte 0x0f, 0x01, 0xc2"

#define ASM_VMX_VMRESUME          ".byte 0x0f, 0x01, 0xc3"

#define ASM_VMX_VMPTRLD_RAX       ".byte 0x0f, 0xc7, 0x30"

#define ASM_VMX_VMREAD_RDX_RAX    ".byte 0x0f, 0x78, 0xd0"

#define ASM_VMX_VMWRITE_RAX_RDX   ".byte 0x0f, 0x79, 0xd0"

#define ASM_VMX_VMWRITE_RSP_RDX   ".byte 0x0f, 0x79, 0xd4"

#define ASM_VMX_VMXOFF            ".byte 0x0f, 0x01, 0xc4"

#define ASM_VMX_VMXON_RAX         ".byte 0xf3, 0x0f, 0xc7, 0x30"

#define ASM_VMX_INVEPT		  ".byte 0x66, 0x0f, 0x38, 0x80, 0x08"

#define ASM_VMX_INVVPID		  ".byte 0x66, 0x0f, 0x38, 0x81, 0x08"



#define MSR_IA32_TIME_STAMP_COUNTER		0x010



#define TSS_IOPB_BASE_OFFSET 0x66

arch/x86/include/asm/vmx.h

+15 −0
Original line number Diff line number Diff line
@@ -364,4 +364,19 @@ enum vmcs_field { 


#define VMX_EPT_IDENTITY_PAGETABLE_ADDR		0xfffbc000ul





#define ASM_VMX_VMCLEAR_RAX       ".byte 0x66, 0x0f, 0xc7, 0x30"

#define ASM_VMX_VMLAUNCH          ".byte 0x0f, 0x01, 0xc2"

#define ASM_VMX_VMRESUME          ".byte 0x0f, 0x01, 0xc3"

#define ASM_VMX_VMPTRLD_RAX       ".byte 0x0f, 0xc7, 0x30"

#define ASM_VMX_VMREAD_RDX_RAX    ".byte 0x0f, 0x78, 0xd0"

#define ASM_VMX_VMWRITE_RAX_RDX   ".byte 0x0f, 0x79, 0xd0"

#define ASM_VMX_VMWRITE_RSP_RDX   ".byte 0x0f, 0x79, 0xd4"

#define ASM_VMX_VMXOFF            ".byte 0x0f, 0x01, 0xc4"

#define ASM_VMX_VMXON_RAX         ".byte 0xf3, 0x0f, 0xc7, 0x30"

#define ASM_VMX_INVEPT		  ".byte 0x66, 0x0f, 0x38, 0x80, 0x08"

#define ASM_VMX_INVVPID		  ".byte 0x66, 0x0f, 0x38, 0x81, 0x08"







#endif