[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 16/30] target/microblaze: Restrict has_work() handler to sysem
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 16/30] target/microblaze: Restrict has_work() handler to sysemu and TCG |
Date: |
Thu, 2 Sep 2021 18:15:29 +0200 |
Restrict has_work() to TCG sysemu.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/microblaze/cpu.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c
index 15db277925f..74fbb5d201a 100644
--- a/target/microblaze/cpu.c
+++ b/target/microblaze/cpu.c
@@ -92,12 +92,15 @@ static void mb_cpu_synchronize_from_tb(CPUState *cs,
cpu->env.iflags = tb->flags & IFLAGS_TB_MASK;
}
+#ifndef CONFIG_USER_ONLY
+
+#ifdef CONFIG_TCG
static bool mb_cpu_has_work(CPUState *cs)
{
return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
}
+#endif /* CONFIG_TCG */
-#ifndef CONFIG_USER_ONLY
static void mb_cpu_ns_axi_dp(void *opaque, int irq, int level)
{
MicroBlazeCPU *cpu = opaque;
@@ -142,7 +145,7 @@ static void microblaze_cpu_set_irq(void *opaque, int irq,
int level)
cpu_reset_interrupt(cs, type);
}
}
-#endif
+#endif /* !CONFIG_USER_ONLY */
static void mb_cpu_reset(DeviceState *dev)
{
@@ -368,6 +371,7 @@ static const struct TCGCPUOps mb_tcg_ops = {
.tlb_fill = mb_cpu_tlb_fill,
#ifndef CONFIG_USER_ONLY
+ .has_work = mb_cpu_has_work,
.cpu_exec_interrupt = mb_cpu_exec_interrupt,
.do_interrupt = mb_cpu_do_interrupt,
.do_transaction_failed = mb_cpu_transaction_failed,
@@ -386,8 +390,6 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
device_class_set_parent_reset(dc, mb_cpu_reset, &mcc->parent_reset);
cc->class_by_name = mb_cpu_class_by_name;
- cc->has_work = mb_cpu_has_work;
-
cc->dump_state = mb_cpu_dump_state;
cc->set_pc = mb_cpu_set_pc;
cc->gdb_read_register = mb_cpu_gdb_read_register;
--
2.31.1
- [PATCH v3 11/30] target/cris: Restrict has_work() handler to sysemu and TCG, (continued)
- [PATCH v3 11/30] target/cris: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 12/30] target/hexagon: Remove unused has_work() handler, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 13/30] target/hppa: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 14/30] target/i386: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 15/30] target/m68k: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 16/30] target/microblaze: Restrict has_work() handler to sysemu and TCG,
Philippe Mathieu-Daudé <=
- [PATCH v3 17/30] target/mips: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 18/30] target/nios2: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 19/30] target/openrisc: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v3 20/30] target/ppc: Restrict has_work() handler to sysemu and TCG, Philippe Mathieu-Daudé, 2021/09/02