[PATCH] KVM: Use more traditional error handling in kvm_mmu_init()
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 3d367cb..bdffe83 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -647,14 +647,20 @@
ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa));
ASSERT(list_empty(&vcpu->free_pages));
- if ((r = alloc_mmu_pages(vcpu)))
- return r;
+ r = alloc_mmu_pages(vcpu);
+ if (r)
+ goto out;
- if ((r = init_kvm_mmu(vcpu))) {
- free_mmu_pages(vcpu);
- return r;
- }
+ r = init_kvm_mmu(vcpu);
+ if (r)
+ goto out_free_pages;
+
return 0;
+
+out_free_pages:
+ free_mmu_pages(vcpu);
+out:
+ return r;
}
void kvm_mmu_destroy(struct kvm_vcpu *vcpu)