瀏覽代碼

KVM: x86 emulator: Disable writeback for CMP emulation

This stops "CMP r/m, reg" to write back the data into memory.
Pointed out by Avi.

The writeback suppression now covers CMP, CMPS, SCAS.

Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Avi Kivity <avi@redhat.com>
Takuya Yoshikawa 14 年之前
父節點
當前提交
575e7c1417
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/x86/kvm/emulate.c

+ 1 - 1
arch/x86/kvm/emulate.c

@@ -3671,6 +3671,7 @@ special_insn:
 		break;
 		break;
 	case 0x38 ... 0x3d:
 	case 0x38 ... 0x3d:
 	      cmp:		/* cmp */
 	      cmp:		/* cmp */
+		c->dst.type = OP_NONE; /* Disable writeback. */
 		emulate_2op_SrcV("cmp", c->src, c->dst, ctxt->eflags);
 		emulate_2op_SrcV("cmp", c->src, c->dst, ctxt->eflags);
 		break;
 		break;
 	case 0x40 ... 0x47: /* inc r16/r32 */
 	case 0x40 ... 0x47: /* inc r16/r32 */
@@ -3797,7 +3798,6 @@ special_insn:
 		rc = emulate_popf(ctxt, ops, &c->dst.val, c->op_bytes);
 		rc = emulate_popf(ctxt, ops, &c->dst.val, c->op_bytes);
 		break;
 		break;
 	case 0xa6 ... 0xa7:	/* cmps */
 	case 0xa6 ... 0xa7:	/* cmps */
-		c->dst.type = OP_NONE; /* Disable writeback. */
 		goto cmp;
 		goto cmp;
 	case 0xa8 ... 0xa9:	/* test ax, imm */
 	case 0xa8 ... 0xa9:	/* test ax, imm */
 		goto test;
 		goto test;