lkml.org 
[lkml]   [2020]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/30] KVM: nSVM: pass vmcb_control_area to copy_vmcb_control_area
    Date
    This will come in handy when we put a struct vmcb_control_area in
    svm->nested.

    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    ---
    arch/x86/kvm/svm/nested.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
    index 5ca403a69148..fd9742c1a860 100644
    --- a/arch/x86/kvm/svm/nested.c
    +++ b/arch/x86/kvm/svm/nested.c
    @@ -141,11 +141,9 @@ void recalc_intercepts(struct vcpu_svm *svm)
    c->intercept |= g->intercept;
    }

    -static void copy_vmcb_control_area(struct vmcb *dst_vmcb, struct vmcb *from_vmcb)
    +static void copy_vmcb_control_area(struct vmcb_control_area *dst,
    + struct vmcb_control_area *from)
    {
    - struct vmcb_control_area *dst = &dst_vmcb->control;
    - struct vmcb_control_area *from = &from_vmcb->control;
    -
    dst->intercept_cr = from->intercept_cr;
    dst->intercept_dr = from->intercept_dr;
    dst->intercept_exceptions = from->intercept_exceptions;
    @@ -419,7 +417,7 @@ int nested_svm_vmrun(struct vcpu_svm *svm)
    else
    hsave->save.cr3 = kvm_read_cr3(&svm->vcpu);

    - copy_vmcb_control_area(hsave, vmcb);
    + copy_vmcb_control_area(&hsave->control, &vmcb->control);

    svm->nested.nested_run_pending = 1;
    enter_svm_guest_mode(svm, vmcb_gpa, nested_vmcb);
    @@ -550,7 +548,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm)
    nested_vmcb->control.int_ctl &= ~V_INTR_MASKING_MASK;

    /* Restore the original control entries */
    - copy_vmcb_control_area(vmcb, hsave);
    + copy_vmcb_control_area(&vmcb->control, &hsave->control);

    svm->vmcb->control.tsc_offset = svm->vcpu.arch.tsc_offset =
    svm->vcpu.arch.l1_tsc_offset;
    --
    2.26.2

    \
     
     \ /
      Last update: 2020-05-29 17:44    [W:2.582 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site