[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/22] vapic: use tcg_enabled
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/22] vapic: use tcg_enabled |
Date: |
Mon, 3 Jul 2017 18:34:41 +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
- [Qemu-devel] [PATCH 04/22] vl: convert -tb-size to qemu_strtoul, (continued)
- [Qemu-devel] [PATCH 04/22] vl: convert -tb-size to qemu_strtoul, Paolo Bonzini, 2017/07/03
- [Qemu-devel] [PATCH 06/22] tcg: move page_size_init() function, Paolo Bonzini, 2017/07/03
- [Qemu-devel] [PATCH 08/22] tcg: make tcg_allowed global, Paolo Bonzini, 2017/07/03
- [Qemu-devel] [PATCH 07/22] tcg: tcg_handle_interrupt() function, Paolo Bonzini, 2017/07/03
- [Qemu-devel] [PATCH 10/22] vapic: use tcg_enabled,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/22] monitor: disable "info jit" and "info opcount" if !TCG, Paolo Bonzini, 2017/07/03
- [Qemu-devel] [PATCH 11/22] tcg: add the tcg-stub.c file into accel/stubs/, Paolo Bonzini, 2017/07/03
- [Qemu-devel] [PATCH 12/22] tcg: move tb_lock out of translate-all.h, Paolo Bonzini, 2017/07/03
- [Qemu-devel] [PATCH 14/22] tcg: add CONFIG_TCG guards in headers, Paolo Bonzini, 2017/07/03