[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 31/73] cpu: convert to cpu_halted
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [PATCH v7 31/73] cpu: convert to cpu_halted |
Date: |
Mon, 4 Mar 2019 13:17:31 -0500 |
This finishes the conversion to cpu_halted.
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
---
accel/tcg/cpu-exec.c | 2 +-
cpus.c | 8 ++++----
qom/cpu.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 78dca325ba..8af0b5de07 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -435,7 +435,7 @@ static inline bool cpu_handle_halt_locked(CPUState *cpu)
&& replay_interrupt()) {
X86CPU *x86_cpu = X86_CPU(cpu);
- /* prevent deadlock; cpu_mutex must be acquired _after_ the BQL */
+ /* locking order: cpu_mutex must be acquired _after_ the BQL */
cpu_mutex_unlock(cpu);
qemu_mutex_lock_iothread();
cpu_mutex_lock(cpu);
diff --git a/cpus.c b/cpus.c
index 4b967e4674..c6806184ee 100644
--- a/cpus.c
+++ b/cpus.c
@@ -204,7 +204,7 @@ static bool cpu_thread_is_idle(CPUState *cpu)
if (cpu_is_stopped(cpu)) {
return true;
}
- if (!cpu->halted || cpu_has_work(cpu) ||
+ if (!cpu_halted(cpu) || cpu_has_work(cpu) ||
kvm_halt_in_kernel()) {
return false;
}
@@ -1687,7 +1687,7 @@ static void *qemu_hax_cpu_thread_fn(void *arg)
cpu->thread_id = qemu_get_thread_id();
cpu->created = true;
- cpu->halted = 0;
+ cpu_halted_set(cpu, 0);
current_cpu = cpu;
hax_init_vcpu(cpu);
@@ -1846,7 +1846,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
*
* cpu->halted should ensure we sleep in wait_io_event
*/
- g_assert(cpu->halted);
+ g_assert(cpu_halted(cpu));
break;
case EXCP_ATOMIC:
qemu_mutex_unlock_iothread();
@@ -2343,7 +2343,7 @@ CpuInfoList *qmp_query_cpus(Error **errp)
info->value = g_malloc0(sizeof(*info->value));
info->value->CPU = cpu->cpu_index;
info->value->current = (cpu == first_cpu);
- info->value->halted = cpu->halted;
+ info->value->halted = cpu_halted(cpu);
info->value->qom_path = object_get_canonical_path(OBJECT(cpu));
info->value->thread_id = cpu->thread_id;
#if defined(TARGET_I386)
diff --git a/qom/cpu.c b/qom/cpu.c
index 2c05aa1bca..c5106d5af8 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -261,7 +261,7 @@ static void cpu_common_reset(CPUState *cpu)
}
cpu->interrupt_request = 0;
- cpu->halted = 0;
+ cpu_halted_set(cpu, 0);
cpu->mem_io_pc = 0;
cpu->mem_io_vaddr = 0;
cpu->icount_extra = 0;
--
2.17.1
- [Qemu-devel] [PATCH v7 21/73] lm32: convert to cpu_halted, (continued)
- [Qemu-devel] [PATCH v7 21/73] lm32: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 20/73] i386: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 64/73] mips: convert to cpu_has_work_with_iothread_lock, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 13/73] alpha: convert to helper_cpu_halted_set, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 19/73] sh4: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 28/73] gdbstub: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 24/73] riscv: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 26/73] sparc: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 18/73] ppc: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 29/73] openrisc: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 31/73] cpu: convert to cpu_halted,
Emilio G. Cota <=
- [Qemu-devel] [PATCH v7 27/73] xtensa: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 32/73] cpu: define cpu_interrupt_request helpers, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 37/73] openrisc: use cpu_reset_interrupt, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 30/73] cpu-exec: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 22/73] m68k: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 17/73] arm: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 34/73] exec: use cpu_reset_interrupt, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 35/73] i386: use cpu_reset_interrupt, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 25/73] s390x: convert to cpu_halted, Emilio G. Cota, 2019/03/04
- [Qemu-devel] [PATCH v7 36/73] s390x: use cpu_reset_interrupt, Emilio G. Cota, 2019/03/04