From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UT1T0-00017Q-Pl for qemu-devel@nongnu.org; Thu, 18 Apr 2013 22:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UT1Sz-00009d-Rf for qemu-devel@nongnu.org; Thu, 18 Apr 2013 22:54:26 -0400 Received: from [222.73.24.84] (port=14051 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UT1Sz-00008z-GL for qemu-devel@nongnu.org; Thu, 18 Apr 2013 22:54:25 -0400 From: liguang Date: Fri, 19 Apr 2013 10:52:22 +0800 Message-Id: <1366339945-17151-4-git-send-email-lig.fnst@cn.fujitsu.com> In-Reply-To: <1366339945-17151-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1366339945-17151-1-git-send-email-lig.fnst@cn.fujitsu.com> Subject: [Qemu-devel] [PATCH 3/6] target-i386/svm_helper: replace env->eip with EIP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: blauwirbel@gmail.com, pbonzini@redhat.com, aliguori@us.ibm.com, afaerber@suse.de, liguang Signed-off-by: liguang --- target-i386/svm_helper.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c index c46a213..f9ffd18 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); EIP = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rip)); - env->eip = EIP; + EIP = EIP; ESP = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rsp)); EAX = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rax)); env->dr[7] = ldq_phys(env->vm_vmcb + offsetof(struct vmcb, save.dr7)); @@ -541,7 +541,7 @@ void helper_svm_check_io(CPUX86State *env, uint32_t port, uint32_t param, if (lduw_phys(addr + port / 8) & (mask << (port & 7))) { /* next EIP */ stq_phys(env->vm_vmcb + offsetof(struct vmcb, control.exit_info_2), - env->eip + next_eip_addend); + EIP + next_eip_addend); helper_vmexit(env, SVM_EXIT_IOIO, param | (port << 16)); } } @@ -605,7 +605,7 @@ void helper_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1) stq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rflags), cpu_compute_eflags(env)); stq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rip), - env->eip); + EIP); stq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rsp), ESP); stq_phys(env->vm_vmcb + offsetof(struct vmcb, save.rax), EAX); stq_phys(env->vm_vmcb + offsetof(struct vmcb, save.dr7), env->dr[7]); -- 1.7.2.5