From 09856c213a9306ff5e3302ca906e62da842e6b0e Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Thu, 18 Mar 2010 15:20:14 +0200
Subject: [PATCH] --- yaml --- r: 197687 b: refs/heads/master c:
 a41ffb7540cb37426759e688083502d6463421b2 h: refs/heads/master i:   197685:
 01c8f628fad6f94c9b910be8aa7ff6ba88dce358   197683:
 376492f8ecefc93d1a067d7ad51b5f044f4dd9b3   197679:
 8857869980676824cfa1ddca91ede65085ee5e19 v: v3

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

diff --git a/[refs] b/[refs]
index 160f43dc7761..b304961a1c2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd5253658b403d51fc19e56ecb44c54a3071fded
+refs/heads/master: a41ffb7540cb37426759e688083502d6463421b2
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index b89a8f217332..46a7ee3040a0 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -1842,7 +1842,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 	}
 
 	/* LOCK prefix is allowed only with some instructions */
-	if (c->lock_prefix && !(c->d & Lock)) {
+	if (c->lock_prefix && (!(c->d & Lock) || c->dst.type != OP_MEM)) {
 		kvm_queue_exception(ctxt->vcpu, UD_VECTOR);
 		goto done;
 	}