KVM: x86: Unconditionally call x86 ops that are always implemented (92735b1b) · Commits · 戴 / test

Remove a few stale checks for non-NULL ops now that the ops in question are implemented by both VMX and SVM. Note, this is **not** stable material, the Fixes tags are there purely to show when a particular op was first supported by both VMX and SVM. Fixes: ("kvm/svm: Setup MCG_CAP on AMD properly") Fixes: ("KVM: X86: Provide a capability to disable PAUSE intercepts") Fixes: ("svm: Implements update_pi_irte hook to setup posted interrupt") Cc: Krish Sadhukhan <krish.sadhukhan@oracle.com> Signed-off-by:

Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/x86.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -3513,7 +3513,6 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu,
		for (bank = 0; bank < bank_num; bank++)
		vcpu->arch.mce_banks[bank*4] = ~(u64)0;

		if (kvm_x86_ops->setup_mce)
		kvm_x86_ops->setup_mce(vcpu);
		out:
		return r;
		@@ -9330,10 +9329,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
		kvm_page_track_init(kvm);
		kvm_mmu_init_vm(kvm);

		if (kvm_x86_ops->vm_init)
		return kvm_x86_ops->vm_init(kvm);

		return 0;
		}

		static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
		@@ -10025,7 +10021,7 @@ EXPORT_SYMBOL_GPL(kvm_arch_has_noncoherent_dma);

		bool kvm_arch_has_irq_bypass(void)
		{
		return kvm_x86_ops->update_pi_irte != NULL;
		return true;
		}

		int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons,
		@@ -10065,9 +10061,6 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,
		int kvm_arch_update_irqfd_routing(struct kvm *kvm, unsigned int host_irq,
		uint32_t guest_irq, bool set)
		{
		if (!kvm_x86_ops->update_pi_irte)
		return -EINVAL;

		return kvm_x86_ops->update_pi_irte(kvm, host_irq, guest_irq, set);
		}

Admin message