diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2014-04-29 16:37:50 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-13 13:12:40 +0200 |
| commit | 304520291aac95d6a45a3f369f5275e11ef15b2e (patch) | |
| tree | ef8cb6d88ef11a8e7f70f31de8af2855437ead60 /target-i386 | |
| parent | 639973a4740f38789057744b550df3a175bc49ad (diff) | |
| download | qemu-304520291aac95d6a45a3f369f5275e11ef15b2e.zip qemu-304520291aac95d6a45a3f369f5275e11ef15b2e.tar.gz qemu-304520291aac95d6a45a3f369f5275e11ef15b2e.tar.bz2 | |
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: Kevin O'Connor <kevin@koconnor.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/svm_helper.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c index aa17ecd..848a4b99 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. */ |