diff options
| author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2010-01-22 16:55:05 +0800 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-01 12:36:05 -0300 |
| commit | d7fa6ab217aeed26293e01d7b64f79a1ac57e823 (patch) | |
| tree | 3a9a3d829ca9e3df18d43aa01591ee3635828c4e /arch/x86/kvm | |
| parent | 0c04851c0c093ce98ab4ca69556480d779292418 (diff) | |
| download | op-kernel-dev-d7fa6ab217aeed26293e01d7b64f79a1ac57e823.zip op-kernel-dev-d7fa6ab217aeed26293e01d7b64f79a1ac57e823.tar.gz | |
KVM: MMU: Remove some useless code from alloc_mmu_pages()
If we fail to alloc page for vcpu->arch.mmu.pae_root, call to
free_mmu_pages() is unnecessary, which just do free the page
malloc for vcpu->arch.mmu.pae_root.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 599c422..dc4d954 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2843,16 +2843,13 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu) */ page = alloc_page(GFP_KERNEL | __GFP_DMA32); if (!page) - goto error_1; + return -ENOMEM; + vcpu->arch.mmu.pae_root = page_address(page); for (i = 0; i < 4; ++i) vcpu->arch.mmu.pae_root[i] = INVALID_PAGE; return 0; - -error_1: - free_mmu_pages(vcpu); - return -ENOMEM; } int kvm_mmu_create(struct kvm_vcpu *vcpu) |
