[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/51] target/i386: hax: change to use x86_update_hfl
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 30/51] target/i386: hax: change to use x86_update_hflags |
Date: |
Tue, 16 Jan 2018 15:17:12 +0100 |
From: Tao Wu <address@hidden>
Change to use x86_update_hflags instead of keeping another copy
at hax side. This also fix bug like HF_CPL_MASK should be SS.DPL,
not CS.DPL.
Signed-off-by: Tao Wu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target/i386/hax-all.c | 52 +--------------------------------------------------
1 file changed, 1 insertion(+), 51 deletions(-)
diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c
index 3ce6950..07df73e 100644
--- a/target/i386/hax-all.c
+++ b/target/i386/hax-all.c
@@ -782,56 +782,6 @@ static int hax_set_segments(CPUArchState *env, struct
vcpu_state_t *sregs)
return 0;
}
-/*
- * After get the state from the kernel module, some
- * qemu emulator state need be updated also
- */
-static int hax_setup_qemu_emulator(CPUArchState *env)
-{
-
-#define HFLAG_COPY_MASK (~( \
- HF_CPL_MASK | HF_PE_MASK | HF_MP_MASK | HF_EM_MASK | \
- HF_TS_MASK | HF_TF_MASK | HF_VM_MASK | HF_IOPL_MASK | \
- HF_OSFXSR_MASK | HF_LMA_MASK | HF_CS32_MASK | \
- HF_SS32_MASK | HF_CS64_MASK | HF_ADDSEG_MASK))
-
- uint32_t hflags;
-
- hflags = (env->segs[R_CS].flags >> DESC_DPL_SHIFT) & HF_CPL_MASK;
- hflags |= (env->cr[0] & CR0_PE_MASK) << (HF_PE_SHIFT - CR0_PE_SHIFT);
- hflags |= (env->cr[0] << (HF_MP_SHIFT - CR0_MP_SHIFT)) &
- (HF_MP_MASK | HF_EM_MASK | HF_TS_MASK);
- hflags |= (env->eflags & (HF_TF_MASK | HF_VM_MASK | HF_IOPL_MASK));
- hflags |= (env->cr[4] & CR4_OSFXSR_MASK) <<
- (HF_OSFXSR_SHIFT - CR4_OSFXSR_SHIFT);
-
- if (env->efer & MSR_EFER_LMA) {
- hflags |= HF_LMA_MASK;
- }
-
- if ((hflags & HF_LMA_MASK) && (env->segs[R_CS].flags & DESC_L_MASK)) {
- hflags |= HF_CS32_MASK | HF_SS32_MASK | HF_CS64_MASK;
- } else {
- hflags |= (env->segs[R_CS].flags & DESC_B_MASK) >>
- (DESC_B_SHIFT - HF_CS32_SHIFT);
- hflags |= (env->segs[R_SS].flags & DESC_B_MASK) >>
- (DESC_B_SHIFT - HF_SS32_SHIFT);
- if (!(env->cr[0] & CR0_PE_MASK) ||
- (env->eflags & VM_MASK) || !(hflags & HF_CS32_MASK)) {
- hflags |= HF_ADDSEG_MASK;
- } else {
- hflags |= ((env->segs[R_DS].base |
- env->segs[R_ES].base |
- env->segs[R_SS].base) != 0) << HF_ADDSEG_SHIFT;
- }
- }
-
- hflags &= ~HF_SMM_MASK;
-
- env->hflags = (env->hflags & HFLAG_COPY_MASK) | hflags;
- return 0;
-}
-
static int hax_sync_vcpu_register(CPUArchState *env, int set)
{
struct vcpu_state_t regs;
@@ -888,7 +838,7 @@ static int hax_sync_vcpu_register(CPUArchState *env, int
set)
}
}
if (!set) {
- hax_setup_qemu_emulator(env);
+ x86_update_hflags(env);
}
return 0;
}
--
1.8.3.1
- [Qemu-devel] [PULL 19/51] crypto: fix stack-buffer-overflow error, (continued)
- [Qemu-devel] [PULL 19/51] crypto: fix stack-buffer-overflow error, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 26/51] tests/boot-serial-test: Add tests for microblaze boards, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 22/51] tests: fix coroutine leak in /basic/entered, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 27/51] tests/boot-serial-test: Add a test for the moxiesim machine, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 24/51] disas/s390: fix global-buffer-overflow, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 21/51] tests: fix qmp-test leak, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 29/51] target/i386: move hflags update code to a function, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 28/51] tests/boot-serial-test: Add support for the raspi2 machine, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 31/51] target/i386: hax: Move x86_update_hflags., Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 35/51] icount: fixed saving/restoring of icount warp timers, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 30/51] target/i386: hax: change to use x86_update_hflags,
Paolo Bonzini <=
- [Qemu-devel] [PULL 34/51] scripts/qemu-gdb/timers.py: new helper to dump timer state, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 32/51] target-i386: update hflags on Hypervisor.framework, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 37/51] irq: fix memory leak, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 33/51] scripts/qemu-gdb: add simple tcg lock status helper, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 36/51] cpus: unify qemu_*_wait_io_event, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 41/51] chardev: Clean up previous patch indentation, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 38/51] net: Drop unusual use of do { } while (0);, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 39/51] mips: Tweak location of ';' in macros, Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 40/51] chardev: Use goto/label instead of do/break/while(0), Paolo Bonzini, 2018/01/16
- [Qemu-devel] [PULL 42/51] tests: Avoid 'do/while(false); ' in vhost-user-bridge, Paolo Bonzini, 2018/01/16