Commit d90e3a35 authored Apr 27, 2015 by Julia Lawall Committed by Paolo Bonzini May 07, 2015

KVM: x86: drop unneeded null test



If the null test is needed, the call to cancel_delayed_work_sync would have
already crashed.  Normally, the destroy function should only be called
if the init function has succeeded, in which case ioapic is not null.

Problem found using Coccinelle.

Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 74545705

arch/x86/kvm/ioapic.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -638,12 +638,10 @@ void kvm_ioapic_destroy(struct kvm *kvm)
		struct kvm_ioapic *ioapic = kvm->arch.vioapic;

		cancel_delayed_work_sync(&ioapic->eoi_inject);
		if (ioapic) {
		kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev);
		kvm->arch.vioapic = NULL;
		kfree(ioapic);
		}
		}

		int kvm_get_ioapic(struct kvm kvm, struct kvm_ioapic_state state)
		{

Admin message