From patchwork Fri Aug 6 07:26:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 117721 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o767S07U029398 for ; Fri, 6 Aug 2010 07:28:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760539Ab0HFH16 (ORCPT ); Fri, 6 Aug 2010 03:27:58 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:51152 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1760523Ab0HFH15 (ORCPT ); Fri, 6 Aug 2010 03:27:57 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 511DB170168; Fri, 6 Aug 2010 15:27:56 +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 o767OqIa017548; Fri, 6 Aug 2010 15:24:52 +0800 Received: from [10.167.141.76] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 2E9F214C012; Fri, 6 Aug 2010 15:28:45 +0800 (CST) Message-ID: <4C5BB910.8080405@cn.fujitsu.com> Date: Fri, 06 Aug 2010 15:26:08 +0800 From: Wei Yongjun User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100528 Thunderbird/3.0.5 MIME-Version: 1.0 To: Avi Kivity CC: kvm@vger.kernel.org Subject: [PATCH 2/3 v2] KVM: x86 emulator: do not adjust the address for immediate source References: <4C5BB725.3060609@cn.fujitsu.com> <4C5BB7C0.6020800@cn.fujitsu.com> In-Reply-To: <4C5BB7C0.6020800@cn.fujitsu.com> 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]); Fri, 06 Aug 2010 07:28:00 +0000 (UTC) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 470c7eb..e7e3d2d 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -728,7 +728,7 @@ static void fetch_bit_operand(struct decode_cache *c) { unsigned long mask, byte_offset; - if (c->dst.type == OP_MEM) { + if (c->dst.type == OP_MEM && c->src.type == OP_REG) { if (c->src.bytes == 2) c->src.val = (s16)c->src.val; else if (c->src.bytes == 4)