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

Commit cdc0e244 authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti
Browse files

KVM: VMX: Move some cr[04] related constants to vmx.c 



They have no place in common code.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 59708670

arch/x86/include/asm/kvm_host.h

+0 −13
Original line number Diff line number Diff line
@@ -38,19 +38,6 @@ 
#define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS |	\

				  0xFFFFFF0000000000ULL)



#define KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST				\

	(X86_CR0_WP | X86_CR0_NE | X86_CR0_NW | X86_CR0_CD)

#define KVM_GUEST_CR0_MASK						\

	(KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST | X86_CR0_PG | X86_CR0_PE)

#define KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST				\

	(X86_CR0_WP | X86_CR0_NE | X86_CR0_TS | X86_CR0_MP)

#define KVM_VM_CR0_ALWAYS_ON						\

	(KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST | X86_CR0_PG | X86_CR0_PE)

#define KVM_GUEST_CR4_MASK						\

	(X86_CR4_VME | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE | X86_CR4_VMXE)

#define KVM_PMODE_VM_CR4_ALWAYS_ON (X86_CR4_PAE | X86_CR4_VMXE)

#define KVM_RMODE_VM_CR4_ALWAYS_ON (X86_CR4_VME | X86_CR4_PAE | X86_CR4_VMXE)



#define INVALID_PAGE (~(hpa_t)0)

#define UNMAPPED_GVA (~(gpa_t)0)

arch/x86/kvm/vmx.c

+13 −0
Original line number Diff line number Diff line
@@ -61,6 +61,19 @@ module_param_named(unrestricted_guest, 
static int __read_mostly emulate_invalid_guest_state = 0;

module_param(emulate_invalid_guest_state, bool, S_IRUGO);



#define KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST				\

	(X86_CR0_WP | X86_CR0_NE | X86_CR0_NW | X86_CR0_CD)

#define KVM_GUEST_CR0_MASK						\

	(KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST | X86_CR0_PG | X86_CR0_PE)

#define KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST				\

	(X86_CR0_WP | X86_CR0_NE | X86_CR0_TS | X86_CR0_MP)

#define KVM_VM_CR0_ALWAYS_ON						\

	(KVM_VM_CR0_ALWAYS_ON_UNRESTRICTED_GUEST | X86_CR0_PG | X86_CR0_PE)

#define KVM_GUEST_CR4_MASK						\

	(X86_CR4_VME | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE | X86_CR4_VMXE)

#define KVM_PMODE_VM_CR4_ALWAYS_ON (X86_CR4_PAE | X86_CR4_VMXE)

#define KVM_RMODE_VM_CR4_ALWAYS_ON (X86_CR4_VME | X86_CR4_PAE | X86_CR4_VMXE)



/*

 * These 2 parameters are used to config the controls for Pause-Loop Exiting:

 * ple_gap:    upper bound on the amount of time between two successive