From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkCHD-0002T2-Gd for qemu-devel@nongnu.org; Tue, 13 May 2014 08:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkCH8-00082u-61 for qemu-devel@nongnu.org; Tue, 13 May 2014 08:57:47 -0400 Received: from mail-ee0-x22e.google.com ([2a00:1450:4013:c00::22e]:47136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkCH7-00082p-Uq for qemu-devel@nongnu.org; Tue, 13 May 2014 08:57:42 -0400 Received: by mail-ee0-f46.google.com with SMTP id t10so389868eei.19 for ; Tue, 13 May 2014 05:57:41 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 13 May 2014 14:57:14 +0200 Message-Id: <1399985844-788-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1399985844-788-1-git-send-email-pbonzini@redhat.com> References: <1399985844-788-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 05/15] target-i386: set eflags prior to calling svm_load_seg_cache() in svm_helper.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Kevin O'Connor From: Kevin O'Connor The svm_load_seg_cache() function calls cpu_x86_load_seg_cache() which inspects env->eflags. So, make sure all changes to eflags are done prior to loading the segment cache. Signed-off-by: Kevin O'Connor Signed-off-by: Paolo Bonzini --- target-i386/svm_helper.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c index aa17ecd..848a4b9 100644 --- a/target-i386/svm_helper.c +++ b/target-i386/svm_helper.c @@ -703,7 +703,8 @@ void helper_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1) cpu_load_eflags(env, ldq_phys(cs->as, env->vm_hsave + offsetof(struct vmcb, save.rflags)), - ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C | DF_MASK)); + ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C | DF_MASK | + VM_MASK)); CC_OP = CC_OP_EFLAGS; svm_load_seg_cache(env, env->vm_hsave + offsetof(struct vmcb, save.es), @@ -756,10 +757,6 @@ void helper_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1) from the page table indicated the host's CR3. If the PDPEs contain illegal state, the processor causes a shutdown. */ - /* Forces CR0.PE = 1, RFLAGS.VM = 0. */ - env->cr[0] |= CR0_PE_MASK; - env->eflags &= ~VM_MASK; - /* Disables all breakpoints in the host DR7 register. */ /* Checks the reloaded host state for consistency. */ -- 1.8.3.1