[PATCH 2/3] KVM: x86 emulator: change OUT instruction to use dst instead of src

[Wei Yongjun]

Change OUT instruction to use dst instead of src, so we can
reuse those code for all out instructions.

Signed-off-by: Wei Yongjun <yj...@cn.fujitsu.com>
---
 arch/x86/kvm/emulate.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index f952fd0..95815b9 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2261,12 +2261,12 @@ static struct opcode opcode_table[256] = {
        /* 0xE0 - 0xE7 */
        N, N, N, N,
        D(ByteOp | SrcImmUByte | DstAcc), D(SrcImmUByte | DstAcc),
-       D(ByteOp | SrcImmUByte | DstAcc), D(SrcImmUByte | DstAcc),
+       D(ByteOp | SrcAcc | DstImmUByte), D(SrcAcc | DstImmUByte),
        /* 0xE8 - 0xEF */
        D(SrcImm | Stack), D(SrcImm | ImplicitOps),
        D(SrcImmFAddr | No64), D(SrcImmByte | ImplicitOps),
        D(SrcNone | ByteOp | DstAcc), D(SrcNone | DstAcc),
-       D(SrcNone | ByteOp | DstAcc), D(SrcNone | DstAcc),
+       D(ByteOp | SrcAcc | ImplicitOps), D(SrcAcc | ImplicitOps),
        /* 0xF0 - 0xF7 */
        N, N, N, N,
        D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3),
@@ -3107,15 +3107,16 @@ special_insn:
                break;
        case 0xee: /* out dx,al */
        case 0xef: /* out dx,(e/r)ax */
-               c->src.val = c->regs[VCPU_REGS_RDX];
+               c->dst.val = c->regs[VCPU_REGS_RDX];
        do_io_out:
-               c->dst.bytes = min(c->dst.bytes, 4u);
-               if (!emulator_io_permited(ctxt, ops, c->src.val, c->dst.bytes)) 
{
+               c->src.bytes = min(c->src.bytes, 4u);
+               if (!emulator_io_permited(ctxt, ops, c->dst.val,
+                                         c->src.bytes)) {
                        emulate_gp(ctxt, 0);
                        goto done;
                }
-               ops->pio_out_emulated(c->dst.bytes, c->src.val, &c->dst.val, 1,
-                                     ctxt->vcpu);
+               ops->pio_out_emulated(c->src.bytes, c->dst.val,
+                                     &c->src.val, 1, ctxt->vcpu);
                c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xf4:              /* hlt */
-- 
1.7.0.4


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html