Commit 30452029 authored by Kevin O'Connor's avatar Kevin O'Connor Committed by Paolo Bonzini
Browse files

target-i386: set eflags prior to calling svm_load_seg_cache() in svm_helper.c 



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: default avatarKevin O'Connor <kevin@koconnor.net>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 639973a4

target-i386/svm_helper.c

+2 −5
Original line number Diff line number Diff line
@@ -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. */