From b2538392cbe65abc73c24c6b5c9270a84ec7f36a Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 11 Sep 2011 11:23:02 +0300
Subject: [PATCH] --- yaml --- r: 271519 b: refs/heads/master c:
 caa8a168e35650961b9b0d43b9b6fc2279351949 h: refs/heads/master i:   271517:
 5c292f2adbf074893a10ba10b0d2d51f2774a621   271515:
 04d7397fc59af0b1c34f6041ddf68c3bc5fa08ba   271511:
 f5215e15e89330a03609fe63fadf2f5438f125ff   271503:
 548e43fb76fd482ef7b847a9ebee089d29b2e2dc   271487:
 ffecfe70e10bd6eef08fbbc6209dc95a06f7f04d v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kvm/emulate.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 85ed9ab79016..582758c7f10f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c61fa9d63b40b06522c5f1d940b084323a090688
+refs/heads/master: caa8a168e35650961b9b0d43b9b6fc2279351949
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index e10fd3732d10..af06539369b4 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -1670,6 +1670,8 @@ static int em_grp3(struct x86_emulate_ctxt *ctxt)
 	switch (ctxt->modrm_reg) {
 	case 0 ... 1:	/* test */
 		emulate_2op_SrcV(ctxt, "test");
+		/* Disable writeback. */
+		ctxt->dst.type = OP_NONE;
 		break;
 	case 2:	/* not */
 		ctxt->dst.val = ~ctxt->dst.val;
@@ -2513,6 +2515,8 @@ static int em_cmp(struct x86_emulate_ctxt *ctxt)
 static int em_test(struct x86_emulate_ctxt *ctxt)
 {
 	emulate_2op_SrcV(ctxt, "test");
+	/* Disable writeback. */
+	ctxt->dst.type = OP_NONE;
 	return X86EMUL_CONTINUE;
 }