Prev: LinuxPPS new functionalities
Next: [PATCH 27/38] KVM: Fix msr trace
From: Avi Kivity on 16 Feb 2010 05:40
From: Wei Yongjun <yjwei(a)cn.fujitsu.com>

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(a)cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com>
---
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)
--
1.6.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: LinuxPPS new functionalities
Next: [PATCH 27/38] KVM: Fix msr trace