Commit d90e3a35 authored by Julia Lawall's avatar Julia Lawall Committed by Paolo Bonzini

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: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 74545705
...@@ -638,11 +638,9 @@ void kvm_ioapic_destroy(struct kvm *kvm) ...@@ -638,11 +638,9 @@ void kvm_ioapic_destroy(struct kvm *kvm)
struct kvm_ioapic *ioapic = kvm->arch.vioapic; struct kvm_ioapic *ioapic = kvm->arch.vioapic;
cancel_delayed_work_sync(&ioapic->eoi_inject); cancel_delayed_work_sync(&ioapic->eoi_inject);
if (ioapic) { kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev);
kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev); kvm->arch.vioapic = NULL;
kvm->arch.vioapic = NULL; kfree(ioapic);
kfree(ioapic);
}
} }
int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state) int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment