motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 09:32:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/i386: Assert !GUEST for user-only

Browse source 
For user-only, we do not need to check for VMM intercept.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210514151342.384376-32-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-05-14 10:13:23 -05:00
parent 5d2238896a
commit b322b3afc1
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
target/i386/tcg/translate.c
View file

@ -139,11 +139,13 @@ typedef struct DisasContext {
#define CPL(S) 3 #define CPL(S) 3
#define IOPL(S) 0 #define IOPL(S) 0
#define SVME(S) false #define SVME(S) false
#define GUEST(S) false
#else #else
#define PE(S) (((S)->flags & HF_PE_MASK) != 0) #define PE(S) (((S)->flags & HF_PE_MASK) != 0)
#define CPL(S) ((S)->cpl) #define CPL(S) ((S)->cpl)
#define IOPL(S) ((S)->iopl) #define IOPL(S) ((S)->iopl)
#define SVME(S) (((S)->flags & HF_SVME_MASK) != 0) #define SVME(S) (((S)->flags & HF_SVME_MASK) != 0)
#define GUEST(S) (((S)->flags & HF_GUEST_MASK) != 0)
#endif #endif
#if defined(CONFIG_USER_ONLY) && defined(TARGET_X86_64) #if defined(CONFIG_USER_ONLY) && defined(TARGET_X86_64)
#define VM86(S) false #define VM86(S) false
@ -677,7 +679,7 @@ static void gen_check_io(DisasContext *s, MemOp ot, target_ulong cur_eip,
tcg_abort(); tcg_abort();
} }
} }
if(s->flags & HF_GUEST_MASK) { if (GUEST(s)) {
gen_update_cc_op(s); gen_update_cc_op(s);
gen_jmp_im(s, cur_eip); gen_jmp_im(s, cur_eip);
svm_flags |= (1 << (4 + ot)); svm_flags |= (1 << (4 + ot));
@ -2417,8 +2419,9 @@ gen_svm_check_intercept_param(DisasContext *s, target_ulong pc_start,
uint32_t type, uint64_t param) uint32_t type, uint64_t param)
{ {
/* no SVM activated; fast case */ /* no SVM activated; fast case */
if (likely(!(s->flags & HF_GUEST_MASK))) if (likely(!GUEST(s))) {
return; return;
}
gen_update_cc_op(s); gen_update_cc_op(s);
gen_jmp_im(s, pc_start - s->cs_base); gen_jmp_im(s, pc_start - s->cs_base);
gen_helper_svm_check_intercept_param(cpu_env, tcg_const_i32(type), gen_helper_svm_check_intercept_param(cpu_env, tcg_const_i32(type),
@ -8517,6 +8520,7 @@ static void i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu)
g_assert(LMA(dc) == ((flags & HF_LMA_MASK) != 0)); g_assert(LMA(dc) == ((flags & HF_LMA_MASK) != 0));
g_assert(ADDSEG(dc) == ((flags & HF_ADDSEG_MASK) != 0)); g_assert(ADDSEG(dc) == ((flags & HF_ADDSEG_MASK) != 0));
g_assert(SVME(dc) == ((flags & HF_SVME_MASK) != 0)); g_assert(SVME(dc) == ((flags & HF_SVME_MASK) != 0));
g_assert(GUEST(dc) == ((flags & HF_GUEST_MASK) != 0));
dc->cc_op = CC_OP_DYNAMIC; dc->cc_op = CC_OP_DYNAMIC;
dc->cc_op_dirty = false; dc->cc_op_dirty = false;