Commit 1e35d3c4 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: fix 'push imm8' emulation 



'push imm8' found itself in the wrong switch somehow, so it is never executed.

This fixes Windows 2003 installation.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent dbeeb816

drivers/kvm/x86_emulate.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -980,17 +980,6 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
			goto cannot_emulate;

			goto cannot_emulate;

		dst.val = (s32) src.val;

		dst.val = (s32) src.val;

		break;

		break;

	case 0x6a: /* push imm8 */

		src.val = 0L;

		src.val = insn_fetch(s8, 1, _eip);

push:

		dst.type  = OP_MEM;

		dst.bytes = op_bytes;

		dst.val = src.val;

		register_address_increment(_regs[VCPU_REGS_RSP], -op_bytes);

		dst.ptr = (void *) register_address(ctxt->ss_base,

							_regs[VCPU_REGS_RSP]);

		break;

	case 0x80 ... 0x83:	/* Grp1 */

	case 0x80 ... 0x83:	/* Grp1 */

		switch (modrm_reg) {

		switch (modrm_reg) {

		case 0:

		case 0:
@@ -1243,6 +1232,17 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		register_address_increment(_regs[VCPU_REGS_RSP], op_bytes);

		register_address_increment(_regs[VCPU_REGS_RSP], op_bytes);

		no_wb = 1; /* Disable writeback. */

		no_wb = 1; /* Disable writeback. */

		break;

		break;

	case 0x6a: /* push imm8 */

		src.val = 0L;

		src.val = insn_fetch(s8, 1, _eip);

	push:

		dst.type  = OP_MEM;

		dst.bytes = op_bytes;

		dst.val = src.val;

		register_address_increment(_regs[VCPU_REGS_RSP], -op_bytes);

		dst.ptr = (void *) register_address(ctxt->ss_base,

							_regs[VCPU_REGS_RSP]);

		break;

	case 0x6c:		/* insb */

	case 0x6c:		/* insb */

	case 0x6d:		/* insw/insd */

	case 0x6d:		/* insw/insd */

		 if (kvm_emulate_pio_string(ctxt->vcpu, NULL,

		 if (kvm_emulate_pio_string(ctxt->vcpu, NULL,