lkml.org 
[lkml]   [2009]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/46] KVM: VMX: Correct wrong vmcs field sizes
    Date
    From: Sheng Yang <sheng@linux.intel.com>

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

    Signed-off-by: Sheng Yang <sheng@linux.intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/x86/kvm/vmx.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index 37ae13d..aba41ae 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -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;
    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-05-20 13:25    [W:0.056 / U:0.188 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site