[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/42] vapic: use tcg_enabled
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 31/42] vapic: use tcg_enabled |
Date: |
Wed, 5 Jul 2017 09:14:34 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/kvmvapic.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 82a4955..0d9ef77 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -410,7 +410,8 @@ static void patch_instruction(VAPICROMState *s, X86CPU
*cpu, target_ulong ip)
handlers = &s->rom_state.mp;
}
- if (!kvm_enabled()) {
+ if (tcg_enabled()) {
+ cpu_restore_state(cs, cs->mem_io_pc);
cpu_get_tb_cpu_state(env, ¤t_pc, ¤t_cs_base,
¤t_flags);
/* Account this instruction, because we will exit the tb.
@@ -456,7 +457,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU
*cpu, target_ulong ip)
resume_all_vcpus();
- if (!kvm_enabled()) {
+ if (tcg_enabled()) {
/* Both tb_lock and iothread_mutex will be reset when
* longjmps back into the cpu_exec loop. */
tb_lock();
--
1.8.3.1
- Re: [Qemu-devel] [PULL 24/42] configure: add --disable-tcg configure option, (continued)
- [Qemu-devel] [PULL 26/42] vl: add tcg_enabled() for tcg related code, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 21/42] qemu-doc: do not refer to years-old version numbers, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 23/42] configure: early test for supported targets, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 20/42] qemu-thread: Assert locks are initialized before using, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 25/42] vl: convert -tb-size to qemu_strtoul, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 27/42] tcg: move page_size_init() function, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 28/42] cpu: move interrupt handling out of translate-common.c, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 29/42] tcg: make tcg_allowed global, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 32/42] tcg: add the tcg-stub.c file into accel/stubs/, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 31/42] vapic: use tcg_enabled,
Paolo Bonzini <=
- [Qemu-devel] [PULL 30/42] monitor: disable "info jit" and "info opcount" if !TCG, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 33/42] tcg: move tb_lock out of translate-all.h, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 37/42] target/i386: move cpu_sync_bndcs_hflags() function, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 34/42] exec: elide calls to tb_lock and tb_unlock, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 36/42] tcg: add the CONFIG_TCG into Makefiles, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 35/42] tcg: add CONFIG_TCG guards in headers, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 38/42] target/i386: make cpu_get_fp80()/cpu_set_fp80() static, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 41/42] target/i386: add the tcg_enabled() in target/i386/, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 39/42] target/i386: split cpu_set_mxcsr() and make cpu_set_fpuc() inline, Paolo Bonzini, 2017/07/05
- [Qemu-devel] [PULL 42/42] target/i386: add the CONFIG_TCG into Makefiles, Paolo Bonzini, 2017/07/05