Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=270fd9b96f5fcb7df15d3ca6166545d4aa0f3ee9
Commit:     270fd9b96f5fcb7df15d3ca6166545d4aa0f3ee9
Parent:     02e235bc8eebf8a6fef10d46479b3c18f3e9c4f2
Author:     Avi Kivity <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 19 14:37:47 2007 +0200
Committer:  Avi Kivity <[EMAIL PROTECTED]>
CommitDate: Sun Mar 4 11:12:41 2007 +0200

    KVM: Wire up hypercall handlers to a central arch-independent location
    
    Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
---
 drivers/kvm/kvm.h      |    2 ++
 drivers/kvm/kvm_main.c |   36 ++++++++++++++++++++++++++++++++++++
 drivers/kvm/svm.c      |   10 +---------
 drivers/kvm/vmx.c      |   10 +---------
 4 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index fd7746a..41cc27d 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -482,6 +482,8 @@ void kvm_mmu_post_write(struct kvm_vcpu *vcpu, gpa_t gpa, 
int bytes);
 int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);
 void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
 
+int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run);
+
 static inline int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva,
                                     u32 error_code)
 {
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 757a41f..2be9738 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -1138,6 +1138,42 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 }
 EXPORT_SYMBOL_GPL(emulate_instruction);
 
+int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run)
+{
+       unsigned long nr, a0, a1, a2, a3, a4, a5, ret;
+
+       kvm_arch_ops->decache_regs(vcpu);
+       ret = -KVM_EINVAL;
+#ifdef CONFIG_X86_64
+       if (is_long_mode(vcpu)) {
+               nr = vcpu->regs[VCPU_REGS_RAX];
+               a0 = vcpu->regs[VCPU_REGS_RDI];
+               a1 = vcpu->regs[VCPU_REGS_RSI];
+               a2 = vcpu->regs[VCPU_REGS_RDX];
+               a3 = vcpu->regs[VCPU_REGS_RCX];
+               a4 = vcpu->regs[VCPU_REGS_R8];
+               a5 = vcpu->regs[VCPU_REGS_R9];
+       } else
+#endif
+       {
+               nr = vcpu->regs[VCPU_REGS_RBX] & -1u;
+               a0 = vcpu->regs[VCPU_REGS_RAX] & -1u;
+               a1 = vcpu->regs[VCPU_REGS_RCX] & -1u;
+               a2 = vcpu->regs[VCPU_REGS_RDX] & -1u;
+               a3 = vcpu->regs[VCPU_REGS_RSI] & -1u;
+               a4 = vcpu->regs[VCPU_REGS_RDI] & -1u;
+               a5 = vcpu->regs[VCPU_REGS_RBP] & -1u;
+       }
+       switch (nr) {
+       default:
+               ;
+       }
+       vcpu->regs[VCPU_REGS_RAX] = ret;
+       kvm_arch_ops->cache_regs(vcpu);
+       return 1;
+}
+EXPORT_SYMBOL_GPL(kvm_hypercall);
+
 static u64 mk_cr_64(u64 curr_cr, u32 new_val)
 {
        return (curr_cr & ~((1ULL << 32) - 1)) | new_val;
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index aaa6742..711ea42 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -1078,16 +1078,8 @@ static int halt_interception(struct kvm_vcpu *vcpu, 
struct kvm_run *kvm_run)
 
 static int vmmcall_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
-       printk(KERN_DEBUG "got vmmcall at RIP %08llx\n",
-              vcpu->svm->vmcb->save.rip);
-       printk(KERN_DEBUG "vmmcall params: %08llx, %08lx, %08lx, %08lx\n",
-              vcpu->svm->vmcb->save.rax,
-              vcpu->regs[VCPU_REGS_RCX],
-              vcpu->regs[VCPU_REGS_RDX],
-              vcpu->regs[VCPU_REGS_RBP]);
-       vcpu->svm->vmcb->save.rax = 0;
        vcpu->svm->vmcb->save.rip += 3;
-       return 1;
+       return kvm_hypercall(vcpu, kvm_run);
 }
 
 static int invalid_op_interception(struct kvm_vcpu *vcpu, struct kvm_run 
*kvm_run)
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index ca79e59..ff956a6 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1659,16 +1659,8 @@ static int handle_halt(struct kvm_vcpu *vcpu, struct 
kvm_run *kvm_run)
 
 static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
-       kvm_run->exit_reason = KVM_EXIT_DEBUG;
-       printk(KERN_DEBUG "got vmcall at RIP %08lx\n", vmcs_readl(GUEST_RIP));
-       printk(KERN_DEBUG "vmcall params: %08lx, %08lx, %08lx, %08lx\n",
-               vcpu->regs[VCPU_REGS_RAX],
-               vcpu->regs[VCPU_REGS_RCX],
-               vcpu->regs[VCPU_REGS_RDX],
-               vcpu->regs[VCPU_REGS_RBP]);
-       vcpu->regs[VCPU_REGS_RAX] = 0;
        vmcs_writel(GUEST_RIP, vmcs_readl(GUEST_RIP)+3);
-       return 1;
+       return kvm_hypercall(vcpu, kvm_run);
 }
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to