hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86: Rename kvm_x86_ops.queue_exception to inject_exception

Browse Source 
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>
Link: https://lore.kernel.org/r/20220830231614.3580124-14-seanjc@google.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2022-08-30 23:16:00 +00:00 committed by Paolo Bonzini
parent bfcb08a0b9
commit 6ad75c5c99
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/kvm-x86-ops.h
View File

@ -67,7 +67,7 @@ KVM_X86_OP(get_interrupt_shadow)
KVM_X86_OP(patch_hypercall) KVM_X86_OP(patch_hypercall)
KVM_X86_OP(inject_irq) KVM_X86_OP(inject_irq)
KVM_X86_OP(inject_nmi) KVM_X86_OP(inject_nmi)
KVM_X86_OP(queue_exception) KVM_X86_OP(inject_exception)
KVM_X86_OP(cancel_injection) KVM_X86_OP(cancel_injection)
KVM_X86_OP(interrupt_allowed) KVM_X86_OP(interrupt_allowed)
KVM_X86_OP(nmi_allowed) KVM_X86_OP(nmi_allowed)

2
arch/x86/include/asm/kvm_host.h
View File

@ -1525,7 +1525,7 @@ struct kvm_x86_ops {
unsigned char *hypercall_addr); unsigned char *hypercall_addr);
void (*inject_irq)(struct kvm_vcpu *vcpu, bool reinjected); void (*inject_irq)(struct kvm_vcpu *vcpu, bool reinjected);
void (*inject_nmi)(struct kvm_vcpu *vcpu); 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); void (*cancel_injection)(struct kvm_vcpu *vcpu);
int (*interrupt_allowed)(struct kvm_vcpu *vcpu, bool for_injection); int (*interrupt_allowed)(struct kvm_vcpu *vcpu, bool for_injection);
int (*nmi_allowed)(struct kvm_vcpu *vcpu, bool for_injection); int (*nmi_allowed)(struct kvm_vcpu *vcpu, bool for_injection);

4
arch/x86/kvm/svm/svm.c
View File

@ -461,7 +461,7 @@ static int svm_update_soft_interrupt_rip(struct kvm_vcpu *vcpu)
return 0; 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); struct vcpu_svm *svm = to_svm(vcpu);
unsigned nr = vcpu->arch.exception.nr; unsigned nr = vcpu->arch.exception.nr;
@ -4790,7 +4790,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {
.patch_hypercall = svm_patch_hypercall, .patch_hypercall = svm_patch_hypercall,
.inject_irq = svm_inject_irq, .inject_irq = svm_inject_irq,
.inject_nmi = svm_inject_nmi, .inject_nmi = svm_inject_nmi,
.queue_exception = svm_queue_exception, .inject_exception = svm_inject_exception,
.cancel_injection = svm_cancel_injection, .cancel_injection = svm_cancel_injection,
.interrupt_allowed = svm_interrupt_allowed, .interrupt_allowed = svm_interrupt_allowed,
.nmi_allowed = svm_nmi_allowed, .nmi_allowed = svm_nmi_allowed,

4
arch/x86/kvm/vmx/vmx.c
View File

@ -1684,7 +1684,7 @@ static void vmx_clear_hlt(struct kvm_vcpu *vcpu)
vmcs_write32(GUEST_ACTIVITY_STATE, GUEST_ACTIVITY_ACTIVE); 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); struct vcpu_vmx *vmx = to_vmx(vcpu);
unsigned nr = vcpu->arch.exception.nr; unsigned nr = vcpu->arch.exception.nr;
@ -8054,7 +8054,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {
.patch_hypercall = vmx_patch_hypercall, .patch_hypercall = vmx_patch_hypercall,
.inject_irq = vmx_inject_irq, .inject_irq = vmx_inject_irq,
.inject_nmi = vmx_inject_nmi, .inject_nmi = vmx_inject_nmi,
.queue_exception = vmx_queue_exception, .inject_exception = vmx_inject_exception,
.cancel_injection = vmx_cancel_injection, .cancel_injection = vmx_cancel_injection,
.interrupt_allowed = vmx_interrupt_allowed, .interrupt_allowed = vmx_interrupt_allowed,
.nmi_allowed = vmx_nmi_allowed, .nmi_allowed = vmx_nmi_allowed,

2
arch/x86/kvm/x86.c
View File

@ -9725,7 +9725,7 @@ static void kvm_inject_exception(struct kvm_vcpu *vcpu)
if (vcpu->arch.exception.error_code && !is_protmode(vcpu)) if (vcpu->arch.exception.error_code && !is_protmode(vcpu))
vcpu->arch.exception.error_code = false; 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) static int inject_pending_event(struct kvm_vcpu *vcpu, bool *req_immediate_exit)