[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/8] target-i386: set eflags prior to calling svm_loa
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 5/8] target-i386: set eflags prior to calling svm_load_seg_cache() in svm_helper.c |
Date: |
Sat, 10 May 2014 08:50:49 +0200 |
From: Kevin O'Connor <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PULL 0/8] KVM changes for 2014-05-08, Paolo Bonzini, 2014/05/10
- [Qemu-devel] [PULL 1/8] target-i386: Remove unused data from local array, Paolo Bonzini, 2014/05/10
- [Qemu-devel] [PULL 2/8] kvm: add set_one_reg/get_one_reg helpers, Paolo Bonzini, 2014/05/10
- [Qemu-devel] [PULL 3/8] pci-assign: Fix a bug when map MSI-X table memory failed, Paolo Bonzini, 2014/05/10
- [Qemu-devel] [PULL 4/8] pci-assign: limit # of msix vectors, Paolo Bonzini, 2014/05/10
- [Qemu-devel] [PULL 5/8] target-i386: set eflags prior to calling svm_load_seg_cache() in svm_helper.c,
Paolo Bonzini <=
- [Qemu-devel] [PULL 6/8] target-i386: set eflags and cr0 prior to calling cpu_x86_load_seg_cache() in smm_helper.c, Paolo Bonzini, 2014/05/10
- [Qemu-devel] [PULL 7/8] target-i386: set eflags prior to calling cpu_x86_load_seg_cache() in seg_helper.c, Paolo Bonzini, 2014/05/10
- [Qemu-devel] [PULL 8/8] target-i386: the x86 CPL is stored in CS.selector - auto update hflags accordingly., Paolo Bonzini, 2014/05/10
- Re: [Qemu-devel] [PULL 0/8] KVM changes for 2014-05-08, Cornelia Huck, 2014/05/13