[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/30] target/arm: Restrict has_work() handler to sysemu and TCG
- To: qemu-devel@xxxxxxxxxx
- From: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>
- Date: Thu, 2 Sep 2021 18:15:22 +0200
- Cc: Bin Meng <bin.meng@xxxxxxxxxxxxx>, Eduardo Habkost <ehabkost@xxxxxxxxxx>, Greg Kurz <groug@xxxxxxxx>, haxm-team@xxxxxxxxx, Kamil Rytarowski <kamil@xxxxxxxxxx>, qemu-ppc@xxxxxxxxxx, Anthony Perard <anthony.perard@xxxxxxxxxx>, Marcel Apfelbaum <marcel.apfelbaum@xxxxxxxxx>, Michael Rolnik <mrolnik@xxxxxxxxx>, qemu-riscv@xxxxxxxxxx, Paolo Bonzini <pbonzini@xxxxxxxxxx>, Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>, Thomas Huth <thuth@xxxxxxxxxx>, David Hildenbrand <david@xxxxxxxxxx>, Chris Wulff <crwulff@xxxxxxxxx>, Laurent Vivier <lvivier@xxxxxxxxxx>, Cameron Esfahani <dirty@xxxxxxxxx>, Sunil Muthuswamy <sunilmut@xxxxxxxxxxxxx>, Max Filippov <jcmvbkbc@xxxxxxxxx>, Taylor Simpson <tsimpson@xxxxxxxxxxx>, qemu-s390x@xxxxxxxxxx, Richard Henderson <richard.henderson@xxxxxxxxxx>, Bastian Koppelmann <kbastian@xxxxxxxxxxxxxxxxxxxxx>, Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>, Artyom Tarasenko <atar4qemu@xxxxxxxxx>, Aurelien Jarno <aurelien@xxxxxxxxxxx>, Paul Durrant <paul@xxxxxxx>, Peter Maydell <peter.maydell@xxxxxxxxxx>, David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>, Alistair Francis <alistair.francis@xxxxxxx>, "Edgar E. Iglesias" <edgar.iglesias@xxxxxxxxx>, Roman Bolshakov <r.bolshakov@xxxxxxxxx>, Laurent Vivier <laurent@xxxxxxxxx>, Cornelia Huck <cohuck@xxxxxxxxxx>, qemu-arm@xxxxxxxxxx, Wenchao Wang <wenchao.wang@xxxxxxxxx>, Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx, Marek Vasut <marex@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx>, Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>, Colin Xu <colin.xu@xxxxxxxxx>, Claudio Fontana <cfontana@xxxxxxx>, Palmer Dabbelt <palmer@xxxxxxxxxxx>, Stafford Horne <shorne@xxxxxxxxx>, Reinoud Zandijk <reinoud@xxxxxxxxxx>, kvm@xxxxxxxxxxxxxxx
- Delivery-date: Thu, 02 Sep 2021 16:16:49 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Restrict has_work() to TCG sysemu.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>
---
target/arm/cpu.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index ba0741b20e4..e11aa625a5f 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -73,8 +73,8 @@ void arm_cpu_synchronize_from_tb(CPUState *cs,
env->regs[15] = tb->pc;
}
}
-#endif /* CONFIG_TCG */
+#ifndef CONFIG_USER_ONLY
static bool arm_cpu_has_work(CPUState *cs)
{
ARMCPU *cpu = ARM_CPU(cs);
@@ -85,6 +85,9 @@ static bool arm_cpu_has_work(CPUState *cs)
| CPU_INTERRUPT_VFIQ | CPU_INTERRUPT_VIRQ
| CPU_INTERRUPT_EXITTB);
}
+#endif /* !CONFIG_USER_ONLY */
+
+#endif /* CONFIG_TCG */
void arm_register_pre_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook,
void *opaque)
@@ -2017,6 +2020,7 @@ static const struct TCGCPUOps arm_tcg_ops = {
.debug_excp_handler = arm_debug_excp_handler,
#if !defined(CONFIG_USER_ONLY)
+ .has_work = arm_cpu_has_work,
.cpu_exec_interrupt = arm_cpu_exec_interrupt,
.do_interrupt = arm_cpu_do_interrupt,
.do_transaction_failed = arm_cpu_do_transaction_failed,
@@ -2041,7 +2045,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void
*data)
device_class_set_parent_reset(dc, arm_cpu_reset, &acc->parent_reset);
cc->class_by_name = arm_cpu_class_by_name;
- cc->has_work = arm_cpu_has_work;
cc->dump_state = arm_cpu_dump_state;
cc->set_pc = arm_cpu_set_pc;
cc->gdb_read_register = arm_cpu_gdb_read_register;
--
2.31.1
|