From 131c5de5a85731b330e0f097ddb5d5d450a8cc50 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Fri, 22 Dec 2006 01:05:28 -0800
Subject: [PATCH] --- yaml --- r: 44868 b: refs/heads/master c:
 2c264957105b7c248a456ba6602df667ae986550 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/kvm/mmu.c | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 974a05335a89..82ac5da0de80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36241b8c7cbcc83e7fd534d25e1df8339db8244e
+refs/heads/master: 2c264957105b7c248a456ba6602df667ae986550
diff --git a/trunk/drivers/kvm/mmu.c b/trunk/drivers/kvm/mmu.c
index 3d367cbfe1f9..bdffe83b19e8 100644
--- a/trunk/drivers/kvm/mmu.c
+++ b/trunk/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)