[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 58/71] cpu: call .cpu_has_work with the CPU lock he
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [RFC v4 58/71] cpu: call .cpu_has_work with the CPU lock held |
Date: |
Thu, 25 Oct 2018 10:46:31 -0400 |
Signed-off-by: Emilio G. Cota <address@hidden>
---
include/qom/cpu.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index a86690c7a5..9826cdfa4c 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -84,7 +84,8 @@ struct TranslationBlock;
* @parse_features: Callback to parse command line arguments.
* @reset: Callback to reset the #CPUState to its initial state.
* @reset_dump_flags: #CPUDumpFlags to use for reset logging.
- * @has_work: Callback for checking if there is work to do.
+ * @has_work: Callback for checking if there is work to do. Called with the
+ * CPU lock held.
* @do_interrupt: Callback for interrupt handling.
* @do_unassigned_access: Callback for unassigned access handling.
* (this is deprecated: new targets should use do_transaction_failed instead)
@@ -793,9 +794,16 @@ const char *parse_cpu_model(const char *cpu_model);
static inline bool cpu_has_work(CPUState *cpu)
{
CPUClass *cc = CPU_GET_CLASS(cpu);
+ bool ret;
g_assert(cc->has_work);
- return cc->has_work(cpu);
+ if (cpu_mutex_locked(cpu)) {
+ return cc->has_work(cpu);
+ }
+ cpu_mutex_lock(cpu);
+ ret = cc->has_work(cpu);
+ cpu_mutex_unlock(cpu);
+ return ret;
}
/**
--
2.17.1
- [Qemu-devel] [RFC v4 40/71] i386/whpx-all: convert to cpu_interrupt_request, (continued)
- [Qemu-devel] [RFC v4 40/71] i386/whpx-all: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 44/71] cris: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 41/71] i386/hvf: convert to cpu_request_interrupt, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 42/71] ppc: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 46/71] lm32: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 58/71] cpu: call .cpu_has_work with the CPU lock held,
Emilio G. Cota <=
- [Qemu-devel] [RFC v4 45/71] hppa: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 35/71] openrisc: use cpu_reset_interrupt, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 37/71] i386: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 33/71] i386: use cpu_reset_interrupt, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 17/71] ppc: convert to cpu_halted, Emilio G. Cota, 2018/10/25