From patchwork Thu Jun 17 09:33:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 106643 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 o5H9aRLq025260 for ; Thu, 17 Jun 2010 09:36:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759654Ab0FQJgZ (ORCPT ); Thu, 17 Jun 2010 05:36:25 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:59137 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1759430Ab0FQJgY (ORCPT ); Thu, 17 Jun 2010 05:36:24 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 9A59617011E; Thu, 17 Jun 2010 17:36:22 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o5H9XwNB016166; Thu, 17 Jun 2010 17:33:58 +0800 Received: from [10.167.141.76] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 0291610C16F; Thu, 17 Jun 2010 17:36:12 +0800 (CST) Message-ID: <4C19EC03.50509@cn.fujitsu.com> Date: Thu, 17 Jun 2010 17:33:55 +0800 From: Wei Yongjun User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4 MIME-Version: 1.0 To: Marcelo Tosatti CC: Avi Kivity , kvm@vger.kernel.org Subject: [PATCH] KVM: x86 emulator: fix group3 instruction decoding References: <4C16D0A0.2090203@cn.fujitsu.com> <20100616140927.GA1662@amt.cnet> In-Reply-To: <20100616140927.GA1662@amt.cnet> 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]); Thu, 17 Jun 2010 09:36:27 +0000 (UTC) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index c990db0..abb8cec 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -336,11 +336,11 @@ static u32 group_table[] = { [Group1A*8] = DstMem | SrcNone | ModRM | Mov | Stack, 0, 0, 0, 0, 0, 0, 0, [Group3_Byte*8] = - ByteOp | SrcImm | DstMem | ModRM, 0, + ByteOp | SrcImm | DstMem | ModRM, ByteOp | SrcImm | DstMem | ModRM, ByteOp | DstMem | SrcNone | ModRM, ByteOp | DstMem | SrcNone | ModRM, 0, 0, 0, 0, [Group3*8] = - DstMem | SrcImm | ModRM, 0, + DstMem | SrcImm | ModRM, DstMem | SrcImm | ModRM, DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM, 0, 0, 0, 0, [Group4*8] =