From patchwork Sun Mar 14 16:21:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 85821 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2EGLaJE019785 for ; Sun, 14 Mar 2010 16:21:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759432Ab0CNQVb (ORCPT ); Sun, 14 Mar 2010 12:21:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42465 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754713Ab0CNQVT (ORCPT ); Sun, 14 Mar 2010 12:21:19 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2EGLJUT019772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 14 Mar 2010 12:21:19 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2EGLHDK020626; Sun, 14 Mar 2010 12:21:19 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 4A10418D45B; Sun, 14 Mar 2010 18:21:16 +0200 (IST) From: Gleb Natapov To: avi@redhat.com, mtosatti@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH v2 16/30] KVM: x86 emulator: If LOCK prefix is used dest arg should be memory. Date: Sun, 14 Mar 2010 18:21:01 +0200 Message-Id: <1268583675-3101-17-git-send-email-gleb@redhat.com> In-Reply-To: <1268583675-3101-1-git-send-email-gleb@redhat.com> References: <1268583675-3101-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 14 Mar 2010 16:21:37 +0000 (UTC) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index b89a8f2..46a7ee3 100644 --- a/arch/x86/kvm/emulate.c +++ b/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; }