Commit 2a890614 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: use static_call_cond for optional callbacks 



SVM implements neither update_emulated_instruction nor
set_apic_access_page_addr.  Remove an "if" by calling them
with static_call_cond().

Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8a289785

arch/x86/kvm/x86.c

+2 −6
Original line number Diff line number Diff line
@@ -8421,8 +8421,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, 
			kvm_rip_write(vcpu, ctxt->eip);

			if (r && (ctxt->tf || (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)))

				r = kvm_vcpu_do_singlestep(vcpu);

			if (kvm_x86_ops.update_emulated_instruction)

				static_call(kvm_x86_update_emulated_instruction)(vcpu);

			static_call_cond(kvm_x86_update_emulated_instruction)(vcpu);

			__kvm_set_rflags(vcpu, ctxt->eflags);

		}
@@ -9791,10 +9790,7 @@ static void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu) 
	if (!lapic_in_kernel(vcpu))

		return;



	if (!kvm_x86_ops.set_apic_access_page_addr)

		return;



	static_call(kvm_x86_set_apic_access_page_addr)(vcpu);

	static_call_cond(kvm_x86_set_apic_access_page_addr)(vcpu);

}



void __kvm_request_immediate_exit(struct kvm_vcpu *vcpu)