commit 1ae77badc2504d157800f10a81a58cc9c941e7cb
author Wei Yongjun <yjwei@cn.fujitsu.com> Tue Feb 09 10:31:09 2010 +0800
committer Marcelo Tosatti <mtosatti@redhat.com> Mon Mar 01 12:36:09 2010 -0300
tree 57f590b82a8e20863635ce8b528b79c022b0a8e9
parent d225f53b76f4287365efd381b9e3a732e6bad27e

KVM: kvm->arch.vioapic should be NULL if kvm_ioapic_init() failure

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@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

virt/kvm/ioapic.c

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 @@
 	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;
 }