[kvm-commits] KVM: emulate_instruction() calls now x86_decode_insn() and x86_emulate_insn()

[Avi Kivity]

repository: /home/avi/kvm/linux-2.6
branch: (no branch)
commit 94879177e08d3ddb5fffccc9d9eac5b0e760a1ac
Author: Laurent Vivier <[EMAIL PROTECTED]>
Date:   Tue Sep 18 11:27:27 2007 +0200

    KVM: emulate_instruction() calls now x86_decode_insn() and 
x86_emulate_insn()
    
    emulate_instruction() calls now x86_decode_insn() and x86_emulate_insn().
    x86_emulate_insn() is x86_emulate_memop() without the decoding part.
    
    Signed-off-by: Laurent Vivier <[EMAIL PROTECTED]>
    Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index e301521..bb6004a 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -1308,7 +1308,10 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 
        vcpu->mmio_is_write = 0;
        vcpu->pio.string = 0;
-       r = x86_emulate_memop(&emulate_ctxt, &emulate_ops);
+       r = x86_decode_insn(&emulate_ctxt, &emulate_ops);
+       if (r == 0)
+               r = x86_emulate_insn(&emulate_ctxt, &emulate_ops);
+
        if (vcpu->pio.string)
                return EMULATE_DO_MMIO;
 
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 537b03c..c5102d9 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -899,18 +899,14 @@ done:
 }
 
 int
-x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 {
        unsigned long cr2 = ctxt->cr2;
        int no_wb = 0;
        u64 msr_data;
        unsigned long _eflags = ctxt->eflags;
        struct decode_cache *c = &ctxt->decode;
-       int rc;
-
-       rc = x86_decode_insn(ctxt, ops);
-       if (rc)
-               return rc;
+       int rc = 0;
 
        if (c->src.type == OP_MEM) {
                c->src.ptr = (unsigned long *)ctxt->cr2;
diff --git a/drivers/kvm/x86_emulate.h b/drivers/kvm/x86_emulate.h
index c354200..28acad4 100644
--- a/drivers/kvm/x86_emulate.h
+++ b/drivers/kvm/x86_emulate.h
@@ -178,12 +178,9 @@ struct x86_emulate_ctxt {
 #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT64
 #endif
 
-/*
- * x86_emulate_memop: Emulate an instruction that faulted attempting to
- *                    read/write a 'special' memory area.
- * Returns -1 on failure, 0 on success.
- */
-int x86_emulate_memop(struct x86_emulate_ctxt *ctxt,
-                     struct x86_emulate_ops *ops);
+int x86_decode_insn(struct x86_emulate_ctxt *ctxt,
+                   struct x86_emulate_ops *ops);
+int x86_emulate_insn(struct x86_emulate_ctxt *ctxt,
+                    struct x86_emulate_ops *ops);
 
 #endif                         /* __X86_EMULATE_H__ */

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits