lkml.org 
[lkml]   [2022]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 11/24] KVM: x86: Rename kvm_x86_ops.queue_exception to inject_exception
    From
    Rename the kvm_x86_ops hook for exception injection to better reflect
    reality, and to align with pretty much every other related function name
    in KVM.

    No functional change intended.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
    ---
    arch/x86/include/asm/kvm-x86-ops.h | 2 +-
    arch/x86/include/asm/kvm_host.h | 2 +-
    arch/x86/kvm/svm/svm.c | 4 ++--
    arch/x86/kvm/vmx/vmx.c | 4 ++--
    arch/x86/kvm/x86.c | 2 +-
    5 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h
    index 51f777071584..82ba4a564e58 100644
    --- a/arch/x86/include/asm/kvm-x86-ops.h
    +++ b/arch/x86/include/asm/kvm-x86-ops.h
    @@ -67,7 +67,7 @@ KVM_X86_OP(get_interrupt_shadow)
    KVM_X86_OP(patch_hypercall)
    KVM_X86_OP(inject_irq)
    KVM_X86_OP(inject_nmi)
    -KVM_X86_OP(queue_exception)
    +KVM_X86_OP(inject_exception)
    KVM_X86_OP(cancel_injection)
    KVM_X86_OP(interrupt_allowed)
    KVM_X86_OP(nmi_allowed)
    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index e8281d64a431..dbb9eab979d4 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -1523,7 +1523,7 @@ struct kvm_x86_ops {
    unsigned char *hypercall_addr);
    void (*inject_irq)(struct kvm_vcpu *vcpu, bool reinjected);
    void (*inject_nmi)(struct kvm_vcpu *vcpu);
    - void (*queue_exception)(struct kvm_vcpu *vcpu);
    + void (*inject_exception)(struct kvm_vcpu *vcpu);
    void (*cancel_injection)(struct kvm_vcpu *vcpu);
    int (*interrupt_allowed)(struct kvm_vcpu *vcpu, bool for_injection);
    int (*nmi_allowed)(struct kvm_vcpu *vcpu, bool for_injection);
    diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
    index ba81a7e58f75..a254d3b9926c 100644
    --- a/arch/x86/kvm/svm/svm.c
    +++ b/arch/x86/kvm/svm/svm.c
    @@ -452,7 +452,7 @@ static int svm_update_soft_interrupt_rip(struct kvm_vcpu *vcpu)
    return 0;
    }

    -static void svm_queue_exception(struct kvm_vcpu *vcpu)
    +static void svm_inject_exception(struct kvm_vcpu *vcpu)
    {
    struct vcpu_svm *svm = to_svm(vcpu);
    unsigned nr = vcpu->arch.exception.nr;
    @@ -4796,7 +4796,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {
    .patch_hypercall = svm_patch_hypercall,
    .inject_irq = svm_inject_irq,
    .inject_nmi = svm_inject_nmi,
    - .queue_exception = svm_queue_exception,
    + .inject_exception = svm_inject_exception,
    .cancel_injection = svm_cancel_injection,
    .interrupt_allowed = svm_interrupt_allowed,
    .nmi_allowed = svm_nmi_allowed,
    diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
    index d2b3d30d6afb..34d3f29bfa50 100644
    --- a/arch/x86/kvm/vmx/vmx.c
    +++ b/arch/x86/kvm/vmx/vmx.c
    @@ -1610,7 +1610,7 @@ static void vmx_clear_hlt(struct kvm_vcpu *vcpu)
    vmcs_write32(GUEST_ACTIVITY_STATE, GUEST_ACTIVITY_ACTIVE);
    }

    -static void vmx_queue_exception(struct kvm_vcpu *vcpu)
    +static void vmx_inject_exception(struct kvm_vcpu *vcpu)
    {
    struct vcpu_vmx *vmx = to_vmx(vcpu);
    unsigned nr = vcpu->arch.exception.nr;
    @@ -8013,7 +8013,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {
    .patch_hypercall = vmx_patch_hypercall,
    .inject_irq = vmx_inject_irq,
    .inject_nmi = vmx_inject_nmi,
    - .queue_exception = vmx_queue_exception,
    + .inject_exception = vmx_inject_exception,
    .cancel_injection = vmx_cancel_injection,
    .interrupt_allowed = vmx_interrupt_allowed,
    .nmi_allowed = vmx_nmi_allowed,
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 37d686dbb6aa..dbf95dc53c66 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -9659,7 +9659,7 @@ static void kvm_inject_exception(struct kvm_vcpu *vcpu)

    if (vcpu->arch.exception.error_code && !is_protmode(vcpu))
    vcpu->arch.exception.error_code = false;
    - static_call(kvm_x86_queue_exception)(vcpu);
    + static_call(kvm_x86_inject_exception)(vcpu);
    }

    static int inject_pending_event(struct kvm_vcpu *vcpu, bool *req_immediate_exit)
    --
    2.37.0.170.g444d1eabd0-goog
    \
     
     \ /
      Last update: 2022-07-15 22:44    [W:4.107 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site