[PATCH 05/20] KVM: kvm->arch.vioapic should be NULL if kvm_ioapic_init() failure

[Avi Kivity]

From: Wei Yongjun <yj...@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 <yj...@cn.fujitsu.com>
Signed-off-by: Avi Kivity <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 kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html