lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] KVM: Use more traditional error handling in kvm_mmu_init()

Browse Source 
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Avi Kivity
2006-12-22 01:05:28 -08:00
committed by Linus Torvalds
parent 36241b8c7c
commit 2c26495710
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/kvm/mmu.c
View File

@@ -647,14 +647,20 @@ int kvm_mmu_init(struct kvm_vcpu *vcpu)
ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa)); ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa));
ASSERT(list_empty(&vcpu->free_pages)); ASSERT(list_empty(&vcpu->free_pages));
if ((r = alloc_mmu_pages(vcpu))) r = alloc_mmu_pages(vcpu);
return r; 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; return 0;
out_free_pages:
free_mmu_pages(vcpu);
out:
return r;
} }
void kvm_mmu_destroy(struct kvm_vcpu *vcpu) void kvm_mmu_destroy(struct kvm_vcpu *vcpu)