Commit f0ed4760 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Move emulation-only helpers to emulate.c 



Move ctxt_virt_addr_bits() and emul_is_noncanonical_address() from x86.h
to emulate.c.  This eliminates all references to struct x86_emulate_ctxt
from x86.h, and sets the stage for a future patch to stop including
kvm_emulate.h in asm/kvm_host.h.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 21f1b8f2

arch/x86/kvm/emulate.c

+11 −0
Original line number Diff line number Diff line
@@ -665,6 +665,17 @@ static void set_segment_selector(struct x86_emulate_ctxt *ctxt, u16 selector, 
	ctxt->ops->set_segment(ctxt, selector, &desc, base3, seg);

}



static inline u8 ctxt_virt_addr_bits(struct x86_emulate_ctxt *ctxt)

{

	return (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_LA57) ? 57 : 48;

}



static inline bool emul_is_noncanonical_address(u64 la,

						struct x86_emulate_ctxt *ctxt)

{

	return get_canonical(la, ctxt_virt_addr_bits(ctxt)) != la;

}



/*

 * x86 defines three classes of vector instructions: explicitly

 * aligned, explicitly unaligned, and the rest, which change behaviour

arch/x86/kvm/x86.h

+0 −11
Original line number Diff line number Diff line
@@ -149,11 +149,6 @@ static inline u8 vcpu_virt_addr_bits(struct kvm_vcpu *vcpu) 
	return kvm_read_cr4_bits(vcpu, X86_CR4_LA57) ? 57 : 48;

}



static inline u8 ctxt_virt_addr_bits(struct x86_emulate_ctxt *ctxt)

{

	return (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_LA57) ? 57 : 48;

}



static inline u64 get_canonical(u64 la, u8 vaddr_bits)

{

	return ((int64_t)la << (64 - vaddr_bits)) >> (64 - vaddr_bits);
@@ -164,12 +159,6 @@ static inline bool is_noncanonical_address(u64 la, struct kvm_vcpu *vcpu) 
	return get_canonical(la, vcpu_virt_addr_bits(vcpu)) != la;

}



static inline bool emul_is_noncanonical_address(u64 la,

						struct x86_emulate_ctxt *ctxt)

{

	return get_canonical(la, ctxt_virt_addr_bits(ctxt)) != la;

}



static inline void vcpu_cache_mmio_info(struct kvm_vcpu *vcpu,

					gva_t gva, gfn_t gfn, unsigned access)

{