Re: [PATCH v2 11/21] KVM: x86: Rename kvm_x86_ops.queue_exception to inject_exception

[Maxim Levitsky]

On Tue, 2022-06-14 at 20:47 +0000, Sean Christopherson wrote:
> 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.

100% True.
> 
> No functional change intended.
> 
> Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
> ---
>  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 6f2f1affbb78..a42e2d9b04fe 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 7e98b2876380..16a7f91cdf75 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1505,7 +1505,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 c6cca0ce127b..ca39f76ca44b 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -430,7 +430,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;
> @@ -4761,7 +4761,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 ec98992024e2..26b863c78a9f 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;
> @@ -7993,7 +7993,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 7c3ce601bdcc..b63421d511c5 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -9504,7 +9504,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)

Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>

Best regards,
	Maxim Levitsky <mlevitsk@xxxxxxxxxx>