[PATCH 05/20] KVM: kvm->arch.vioapic should be NULL if kvm_ioapic_init() failure
in [Kernel]
|
Prev: [PATCH 07/20] KVM: ia64: destroy ioapic device if fail to setup default irq routing
Next: [patch 0/2] pci: raw_spinlock annotations
From: Avi Kivity on 17 Feb 2010 09:00 From: Wei Yongjun <yjwei(a)cn.fujitsu.com> kvm->arch.vioapic should be NULL in case of kvm_ioapic_init() failure due to cannot register io dev. Signed-off-by: Wei Yongjun <yjwei(a)cn.fujitsu.com> Signed-off-by: Avi Kivity <avi(a)redhat.com> --- virt/kvm/ioapic.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index a2edfd1..f3d0693 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -393,8 +393,10 @@ int kvm_ioapic_init(struct kvm *kvm) mutex_lock(&kvm->slots_lock); ret = kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, &ioapic->dev); mutex_unlock(&kvm->slots_lock); - if (ret < 0) + if (ret < 0) { + kvm->arch.vioapic = NULL; kfree(ioapic); + } return ret; } -- 1.6.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |