aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/mmu.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2006-12-22 04:05:28 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-22 11:55:46 -0500
commit2c264957105b7c248a456ba6602df667ae986550 (patch)
treef4dde78d957602f696af75bfb7a13b1e80c12236 /drivers/kvm/mmu.c
parent36241b8c7cbcc83e7fd534d25e1df8339db8244e (diff)
[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>
Diffstat (limited to 'drivers/kvm/mmu.c')
-rw-r--r--drivers/kvm/mmu.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 3d367cbfe1f9..bdffe83b19e8 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -647,14 +647,20 @@ int kvm_mmu_init(struct kvm_vcpu *vcpu)
647 ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa)); 647 ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa));
648 ASSERT(list_empty(&vcpu->free_pages)); 648 ASSERT(list_empty(&vcpu->free_pages));
649 649
650 if ((r = alloc_mmu_pages(vcpu))) 650 r = alloc_mmu_pages(vcpu);
651 return r; 651 if (r)
652 goto out;
653
654 r = init_kvm_mmu(vcpu);
655 if (r)
656 goto out_free_pages;
652 657
653 if ((r = init_kvm_mmu(vcpu))) {
654 free_mmu_pages(vcpu);
655 return r;
656 }
657 return 0; 658 return 0;
659
660out_free_pages:
661 free_mmu_pages(vcpu);
662out:
663 return r;
658} 664}
659 665
660void kvm_mmu_destroy(struct kvm_vcpu *vcpu) 666void kvm_mmu_destroy(struct kvm_vcpu *vcpu)