From patchwork Tue May 28 08:21:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 246740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1EE862C03A2 for ; Tue, 28 May 2013 18:27:31 +1000 (EST) Received: from localhost ([::1]:42902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhFFh-0002Uz-8Y for incoming@patchwork.ozlabs.org; Tue, 28 May 2013 04:27:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhFC9-0006D1-Pj for qemu-devel@nongnu.org; Tue, 28 May 2013 04:23:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhFBv-0001Wy-7y for qemu-devel@nongnu.org; Tue, 28 May 2013 04:23:49 -0400 Received: from [222.73.24.84] (port=40179 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhFBu-0001VT-UE for qemu-devel@nongnu.org; Tue, 28 May 2013 04:23:35 -0400 X-IronPort-AV: E=Sophos;i="4.87,756,1363104000"; d="scan'208";a="7388317" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 28 May 2013 16:20:43 +0800 Received: from fnstmail02.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 r4S8NUgE015549; Tue, 28 May 2013 16:23:33 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013052816220229-1588306 ; Tue, 28 May 2013 16:22:02 +0800 From: liguang To: qemu-devel@nongnu.org Date: Tue, 28 May 2013 16:21:09 +0800 Message-Id: <1369729270-9991-11-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1369729270-9991-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1369729270-9991-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/28 16:22:02, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/28 16:22:05, Serialize complete at 2013/05/28 16:22:05 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Peter Maydell , Anthony Liguori , Eduardo Habkost , Blue Swirl , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , liguang , Richard Henderson Subject: [Qemu-devel] [PATCH v4 11/12] target-i386/helper: remove redundant env->eip assignment X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: liguang --- target-i386/svm_helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c index 649be02..e18fa35 100644 --- a/target-i386/svm_helper.c +++ b/target-i386/svm_helper.c @@ -249,7 +249,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) R_DS); env->eip = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rip)); - env->eip = env->eip; + env->regs[R_ESP] = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rsp)); env->regs[R_EAX] = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rax)); env->dr[7] = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.dr7));