From 2c264957105b7c248a456ba6602df667ae986550 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 22 Dec 2006 01:05:28 -0800 Subject: [PATCH] KVM: Use more traditional error handling in kvm_mmu_init() Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/kvm/mmu.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c index 3d367cbfe1f..bdffe83b19e 100644 --- a/drivers/kvm/mmu.c +++ b/drivers/kvm/mmu.c @@ -647,14 +647,20 @@ int kvm_mmu_init(struct kvm_vcpu *vcpu) 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; + + r = init_kvm_mmu(vcpu); + if (r) + goto out_free_pages; - if ((r = init_kvm_mmu(vcpu))) { - free_mmu_pages(vcpu); - return r; - } return 0; + +out_free_pages: + free_mmu_pages(vcpu); +out: + return r; } void kvm_mmu_destroy(struct kvm_vcpu *vcpu) -- cgit v1.2.3