From patchwork Wed Apr 28 16:15:25 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Gleb Natapov <gleb@redhat.com>
X-Patchwork-Id: 95723
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 o3SGFrbt032166
	for <patchwork-kvm@patchwork.kernel.org>;
	Wed, 28 Apr 2010 16:15:54 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755496Ab0D1QPu (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 28 Apr 2010 12:15:50 -0400
Received: from mx1.redhat.com ([209.132.183.28]:8714 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753864Ab0D1QPq (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 28 Apr 2010 12:15:46 -0400
Received: from int-mx03.intmail.prod.int.phx2.redhat.com
	(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3SGFkKc020897
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Wed, 28 Apr 2010 12:15:46 -0400
Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com
	[10.35.1.237])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o3SGFil2007732; Wed, 28 Apr 2010 12:15:45 -0400
Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519)
	id 2D49C1336D3; Wed, 28 Apr 2010 19:15:44 +0300 (IDT)
From: Gleb Natapov <gleb@redhat.com>
To: avi@redhat.com, mtosatti@redhat.com
Cc: kvm@vger.kernel.org
Subject: [PATCHv2 04/23] KVM: x86 emulator: cleanup nop emulation
Date: Wed, 28 Apr 2010 19:15:25 +0300
Message-Id: <1272471344-7076-5-git-send-email-gleb@redhat.com>
In-Reply-To: <1272471344-7076-1-git-send-email-gleb@redhat.com>
References: <1272471344-7076-1-git-send-email-gleb@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
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]);
	Wed, 28 Apr 2010 16:15:54 +0000 (UTC)


diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index ea5c6fd..fbc555b 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2799,8 +2799,8 @@ special_insn:
 			goto done;
 		break;
 	case 0x90: /* nop / xchg r8,rax */
-		if (!(c->rex_prefix & 1)) { /* nop */
-			c->dst.type = OP_NONE;
+		if (c->dst.ptr == (unsigned long *)&c->regs[VCPU_REGS_RAX]) {
+			c->dst.type = OP_NONE;  /* nop */
 			break;
 		}
 	case 0x91 ... 0x97: /* xchg reg,rax */