Commit f9c617f6 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: VMX: Correct wrong vmcs field sizes 



EXIT_QUALIFICATION and GUEST_LINEAR_ADDRESS are natural width, not 64-bit.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7d433b9f

arch/x86/kvm/vmx.c

+6 −6
Original line number Diff line number Diff line
@@ -2991,7 +2991,7 @@ static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


static int handle_invlpg(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

{

	u64 exit_qualification = vmcs_read64(EXIT_QUALIFICATION);

	unsigned long exit_qualification = vmcs_readl(EXIT_QUALIFICATION);



	kvm_mmu_invlpg(vcpu, exit_qualification);

	skip_emulated_instruction(vcpu);
@@ -3007,11 +3007,11 @@ static int handle_wbinvd(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


static int handle_apic_access(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

{

	u64 exit_qualification;

	unsigned long exit_qualification;

	enum emulation_result er;

	unsigned long offset;



	exit_qualification = vmcs_read64(EXIT_QUALIFICATION);

	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);

	offset = exit_qualification & 0xffful;



	er = emulate_instruction(vcpu, kvm_run, 0, 0, 0);
@@ -3062,11 +3062,11 @@ static int handle_task_switch(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


static int handle_ept_violation(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

{

	u64 exit_qualification;

	unsigned long exit_qualification;

	gpa_t gpa;

	int gla_validity;



	exit_qualification = vmcs_read64(EXIT_QUALIFICATION);

	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);



	if (exit_qualification & (1 << 6)) {

		printk(KERN_ERR "EPT: GPA exceeds GAW!\n");
@@ -3078,7 +3078,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		printk(KERN_ERR "EPT: Handling EPT violation failed!\n");

		printk(KERN_ERR "EPT: GPA: 0x%lx, GVA: 0x%lx\n",

			(long unsigned int)vmcs_read64(GUEST_PHYSICAL_ADDRESS),

			(long unsigned int)vmcs_read64(GUEST_LINEAR_ADDRESS));

			vmcs_readl(GUEST_LINEAR_ADDRESS));

		printk(KERN_ERR "EPT: Exit qualification is 0x%lx\n",

			(long unsigned int)exit_qualification);

		kvm_run->exit_reason = KVM_EXIT_UNKNOWN;