From 13e39b36453f4b904010396921f2546bfd6aa262 Mon Sep 17 00:00:00 2001
From: Zhang Xiantao <xiantao.zhang@intel.com>
Date: Fri, 16 Nov 2007 13:05:55 +0800
Subject: [PATCH] --- yaml --- r: 80727 b: refs/heads/master c:
 8b0067913d9d0439d4cf3c1f7314ba71fc7b2958 h: refs/heads/master i:   80725:
 f028e54707011c4498b2b13a05d5f1bed5624d15   80723:
 0c2f6b5213d58324133edd94ae2139cbd7256b02   80719:
 6df0c6c8bcbb5e6d5c37a553f85d80e7b71fd53f v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/kvm/kvm.h      |  3 +++
 trunk/drivers/kvm/kvm_main.c | 24 +-----------------------
 trunk/drivers/kvm/x86.c      | 22 ++++++++++++++++++++++
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 2f6ae1454377..e54c3f7a84ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e08aa78ae5747c6e1dc525e8a40f23c2ea61d757
+refs/heads/master: 8b0067913d9d0439d4cf3c1f7314ba71fc7b2958
diff --git a/trunk/drivers/kvm/kvm.h b/trunk/drivers/kvm/kvm.h
index a7be0733bc48..e34e246eafec 100644
--- a/trunk/drivers/kvm/kvm.h
+++ b/trunk/drivers/kvm/kvm.h
@@ -642,6 +642,9 @@ void kvm_arch_destroy_vm(struct kvm *kvm);
 int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu);
 int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu);
 
+int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
+				    struct kvm_translation *tr);
+
 int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs);
 int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs);
 int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index c782f27265de..3946025f3d37 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -761,28 +761,6 @@ void kvm_resched(struct kvm_vcpu *vcpu)
 }
 EXPORT_SYMBOL_GPL(kvm_resched);
 
-/*
- * Translate a guest virtual address to a guest physical address.
- */
-static int kvm_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
-				    struct kvm_translation *tr)
-{
-	unsigned long vaddr = tr->linear_address;
-	gpa_t gpa;
-
-	vcpu_load(vcpu);
-	mutex_lock(&vcpu->kvm->lock);
-	gpa = vcpu->mmu.gva_to_gpa(vcpu, vaddr);
-	tr->physical_address = gpa;
-	tr->valid = gpa != UNMAPPED_GVA;
-	tr->writeable = 1;
-	tr->usermode = 0;
-	mutex_unlock(&vcpu->kvm->lock);
-	vcpu_put(vcpu);
-
-	return 0;
-}
-
 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
 				    struct kvm_interrupt *irq)
 {
@@ -986,7 +964,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
 		r = -EFAULT;
 		if (copy_from_user(&tr, argp, sizeof tr))
 			goto out;
-		r = kvm_vcpu_ioctl_translate(vcpu, &tr);
+		r = kvm_arch_vcpu_ioctl_translate(vcpu, &tr);
 		if (r)
 			goto out;
 		r = -EFAULT;
diff --git a/trunk/drivers/kvm/x86.c b/trunk/drivers/kvm/x86.c
index 609792637fb4..f1746afab9e5 100644
--- a/trunk/drivers/kvm/x86.c
+++ b/trunk/drivers/kvm/x86.c
@@ -2318,6 +2318,28 @@ struct fxsave {
 #endif
 };
 
+/*
+ * Translate a guest virtual address to a guest physical address.
+ */
+int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
+				    struct kvm_translation *tr)
+{
+	unsigned long vaddr = tr->linear_address;
+	gpa_t gpa;
+
+	vcpu_load(vcpu);
+	mutex_lock(&vcpu->kvm->lock);
+	gpa = vcpu->mmu.gva_to_gpa(vcpu, vaddr);
+	tr->physical_address = gpa;
+	tr->valid = gpa != UNMAPPED_GVA;
+	tr->writeable = 1;
+	tr->usermode = 0;
+	mutex_unlock(&vcpu->kvm->lock);
+	vcpu_put(vcpu);
+
+	return 0;
+}
+
 int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
 {
 	struct fxsave *fxsave = (struct fxsave *)&vcpu->guest_fx_image;