---

yaml --- r: 186058 b: refs/heads/master c: 1ae77ba h: refs/heads/master v: v3
git-mirror · Mar 1, 2010 · 4618326 · 4618326
1 parent 108b886
commit 4618326
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d225f53b76f4287365efd381b9e3a732e6bad27e
+refs/heads/master: 1ae77badc2504d157800f10a81a58cc9c941e7cb
diff --git a/trunk/virt/kvm/ioapic.c b/trunk/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;
 }