Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a13a63fa authored by Wei Yongjun's avatar Wei Yongjun Committed by Avi Kivity
Browse files

KVM: x86 emulator: remove dup code of in/out instruction 



Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 41167be5

arch/x86/kvm/emulate.c

+4 −20
Original line number Diff line number Diff line
@@ -2923,28 +2923,12 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
		break;

	case 0x6c:		/* insb */

	case 0x6d:		/* insw/insd */

		c->dst.bytes = min(c->dst.bytes, 4u);

		if (!emulator_io_permited(ctxt, ops, c->regs[VCPU_REGS_RDX],

					  c->dst.bytes)) {

			emulate_gp(ctxt, 0);

			goto done;

		}

		if (!pio_in_emulated(ctxt, ops, c->dst.bytes,

				     c->regs[VCPU_REGS_RDX], &c->dst.val))

			goto done; /* IO is needed, skip writeback */

		break;

		c->src.val = c->regs[VCPU_REGS_RDX];

		goto do_io_in;

	case 0x6e:		/* outsb */

	case 0x6f:		/* outsw/outsd */

		c->src.bytes = min(c->src.bytes, 4u);

		if (!emulator_io_permited(ctxt, ops, c->regs[VCPU_REGS_RDX],

					  c->src.bytes)) {

			emulate_gp(ctxt, 0);

			goto done;

		}

		ops->pio_out_emulated(c->src.bytes, c->regs[VCPU_REGS_RDX],

				      &c->src.val, 1, ctxt->vcpu);



		c->dst.type = OP_NONE; /* nothing to writeback */

		c->dst.val = c->regs[VCPU_REGS_RDX];

		goto do_io_out;

		break;

	case 0x70 ... 0x7f: /* jcc (short) */

		if (test_cc(c->b, ctxt->eflags))