accel: Move has_work() from SysemuCPUOps to AccelOpsClass
v3 cover accel: Move has_work() from SysemuCPUOps to AccelOpsClass
Hi,
CPU has_work() is a per-accelerator handler. This series
- explicit the KVM / WHPX implementations
- moves TCG implementations in AccelOpsClass
- explicit missing implementations (returning 'false').
Since v2:
- Full rewrite, no more RFC.
Supersedes: <[email protected]> "cpu: Move CPUClass::has_work() to TCGCPUOps"
Philippe Mathieu-Daudé (30):
accel/tcg: Restrict cpu_handle_halt() to sysemu
hw/core: Restrict cpu_has_work() to sysemu
hw/core: Un-inline cpu_has_work()
sysemu: Introduce AccelOpsClass::has_work()
accel/kvm: Implement AccelOpsClass::has_work()
accel/whpx: Implement AccelOpsClass::has_work()
accel/tcg: Implement AccelOpsClass::has_work() as stub target/alpha: Restrict has_work() handler to sysemu and TCG target/arm: Restrict has_work() handler to sysemu and TCG target/avr: Restrict has_work() handler to sysemu and TCG target/cris: Restrict has_work() handler to sysemu and TCG target/hexagon: Remove unused has_work() handler target/hppa: Restrict has_work() handler to sysemu and TCG target/i386: Restrict has_work() handler to sysemu and TCG target/m68k: Restrict has_work() handler to sysemu and TCG target/microblaze: Restrict has_work() handler to sysemu and TCG target/mips: Restrict has_work() handler to sysemu and TCG target/nios2: Restrict has_work() handler to sysemu and TCG target/openrisc: Restrict has_work() handler to sysemu and TCG target/ppc: Restrict has_work() handler to sysemu and TCG target/ppc: Introduce PowerPCCPUClass::has_work() target/ppc: Simplify has_work() handlers
target/riscv: Restrict has_work() handler to sysemu and TCG target/rx: Restrict has_work() handler to sysemu and TCG target/s390x: Restrict has_work() handler to sysemu and TCG target/sh4: Restrict has_work() handler to sysemu and TCG target/sparc: Restrict has_work() handler to sysemu and TCG target/tricore: Restrict has_work() handler to sysemu and TCG target/xtensa: Restrict has_work() handler to sysemu and TCG
accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one
include/hw/core/cpu.h | 28 +-- include/hw/core/tcg-cpu-ops.h | 4 + include/sysemu/accel-ops.h | 5 + target/ppc/cpu-qom.h | 3 + accel/hvf/hvf-accel-ops.c | 6 + accel/kvm/kvm-accel-ops.c | 6 + accel/qtest/qtest.c | 6 + accel/tcg/cpu-exec.c | 8 +- accel/tcg/tcg-accel-ops.c | 12 ++ accel/xen/xen-all.c | 6 + hw/core/cpu-common.c | 6 - softmmu/cpus.c | 10 +- target/alpha/cpu.c | 4 +- target/arm/cpu.c | 7 +- target/avr/cpu.c | 4 +- target/cris/cpu.c | 4 +- target/hexagon/cpu.c | 6 - target/hppa/cpu.c | 4 +- target/i386/cpu.c | 6 - target/i386/hax/hax-accel-ops.c | 6 + target/i386/nvmm/nvmm-accel-ops.c | 6 + target/i386/tcg/tcg-cpu.c | 8 +- target/i386/whpx/whpx-accel-ops.c | 6 + target/m68k/cpu.c | 4 +- target/microblaze/cpu.c | 10 +- target/mips/cpu.c | 4 +- target/nios2/cpu.c | 4 +- target/openrisc/cpu.c | 4 +- target/ppc/cpu_init.c | 324 +++++++++++++++--------------- target/riscv/cpu.c | 8 +- target/rx/cpu.c | 4 +- target/s390x/cpu.c | 4 +- target/sh4/cpu.c | 7 +- target/sparc/cpu.c | 4 +- target/tricore/cpu.c | 6 +- target/xtensa/cpu.c | 16 +- 36 files changed, 321 insertions(+), 239 deletions(-)
Signature · 1 line
2.31.1
PATCH v3 1/30 accel/tcg: Restrict cpu_handle_halt() to sysemu
Commit 372579427a5 ("tcg: enable thread-per-vCPU") added the following comment describing EXCP_HALTED in qemu_tcg_cpu_thread_fn():
case EXCP_HALTED:
/* during start-up the vCPU is reset and the thread is
* kicked several times. If we don't ensure we go back
* to sleep in the halted state we won't cleanly
* start-up when the vCPU is enabled.
*
* cpu->halted should ensure we sleep in wait_io_event
*/
g_assert(cpu->halted);
break;qemu_wait_io_event() is sysemu-specific, so we can restrict the cpu_handle_halt() call in cpu_exec() to system emulation.
--- accel/tcg/cpu-exec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
accel/tcg/cpu-exec.c +6 -2
@@ -586,10 +586,11 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,return ; } +#ifndef CONFIG_USER_ONLY static inline bool cpu_handle_halt (CPUState *cpu) {if (cpu->halted) { -#if defined(TARGET_I386 ) && !defined(CONFIG_USER_ONLY ) +#if defined(TARGET_I386 )if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) {X86CPU *x86_cpu =X86_CPU (cpu);qemu_mutex_lock_iothread ();
@@ -597,7 +598,7 @@ static inline bool cpu_handle_halt(CPUState *cpu)cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL ); qemu_mutex_unlock_iothread(); } -#endif +#endif /* TARGET_I386 */ if (!cpu_has_work (cpu)) {return true; }
@@ -607,6 +608,7 @@ static inline bool cpu_handle_halt(CPUState *cpu) return false; } +#endif /* !CONFIG_USER_ONLY */ static inline void cpu_handle_debug_exception (CPUState *cpu) {
@@ -865,9 +867,11 @@ int cpu_exec(CPUState *cpu)/* replay_interrupt may need current_cpu */ current_cpu = cpu; +#ifndef CONFIG_USER_ONLY if (cpu_handle_halt (cpu)) {return EXCP_HALTED ; } +#endif rcu_read_lock ();
Signature · 1 line
2.31.1
Re: [PATCH v3 01/30] accel/tcg: Restrict cpu_handle_halt() to sysemu
Quoted 3 lines · Philippe Mathieu-Daudé
+#ifndef
CONFIG_USER_ONLY
static inline boolcpu_handle_halt(CPUState *cpu){
Hmm, slightly better to move the ifdef just inside here,
Review static inline bool cpu_handle_halt(CPUState *cpu) · line 608
Quoted 2 lines
(quoted diff) +0
-0@@ -607,6 +608,7 @@ static inline bool cpu_handle_halt(CPUState *cpu)
and here,
Quoted 7 lines
accel/tcg/cpu-exec.c +1
-0return false; } +#endif /* !CONFIG_USER_ONLY */ static inline void cpu_handle_debug_exception (CPUState *cpu) {
accel/tcg/cpu-exec.c int cpu_exec(CPUState *cpu) · line 874
Quoted 8 lines
accel/tcg/cpu-exec.c +2
-0@@ -865,9 +867,11 @@ int cpu_exec(CPUState *cpu)/* replay_interrupt may need current_cpu */ current_cpu = cpu; +#ifndef CONFIG_USER_ONLY if (cpu_handle_halt (cpu)) {return EXCP_HALTED ; } +#endif
which would eliminate this one.
r~
PATCH v3 2/30 hw/core: Restrict cpu_has_work() to sysemu
In reply to Philippe Mathieu-Daudécpu_has_work() is only called from system emulation code.
--- include/hw/core/cpu.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
include/hw/core/cpu.h +16 -16
@@ -538,6 +538,22 @@ enum CPUDumpFlags {void cpu_dump_state (CPUState *cpu,FILE *f,int flags);#ifndef CONFIG_USER_ONLY +/** +* cpu_has_work: +* @cpu: The vCPU to check. +* +* Checks whether the CPU has work to do. +* +* Returns: %true if the CPU has work, %false otherwise. +*/ +static inline bool cpu_has_work (CPUState *cpu) +{ +CPUClass *cc =CPU_GET_CLASS (cpu); + +g_assert (cc->has_work); +return cc->has_work (cpu); +} +/** * cpu_get_phys_page_attrs_debug: * @cpu: The CPU to obtain the physical page address for.
@@ -636,22 +652,6 @@ CPUState *cpu_create(const char *typename);*/ const char *parse_cpu_option (const char *cpu_option); -/** -* cpu_has_work: -* @cpu: The vCPU to check. -* -* Checks whether the CPU has work to do. -* -* Returns: %true if the CPU has work, %false otherwise. -*/ -static inline bool cpu_has_work (CPUState *cpu) -{ -CPUClass *cc =CPU_GET_CLASS (cpu); - -g_assert (cc->has_work); -return cc->has_work (cpu); -} -/** * qemu_cpu_is_self: * @cpu: The vCPU to check against.
Signature · 1 line
2.31.1
Re: [PATCH v3 02/30] hw/core: Restrict cpu_has_work() to sysemu
Quoted 6 lines · Philippe Mathieu-Daudé
cpu_has_work()is only called from system emulation code.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- include/hw/core/cpu.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
r~
PATCH v3 3/30 hw/core: Un-inline cpu_has_work()
In reply to Philippe Mathieu-DaudéWe want to make cpu_has_work() per-accelerator. Only declare its prototype and move its definition to softmmu/cpus.c.
--- include/hw/core/cpu.h | 8 +------- softmmu/cpus.c | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-)
include/hw/core/cpu.h +1 -7
@@ -546,13 +546,7 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flags);* * Returns: %true if the CPU has work, %false otherwise. */ -static inline bool cpu_has_work (CPUState *cpu) -{ -CPUClass *cc =CPU_GET_CLASS (cpu); - -g_assert (cc->has_work); -return cc->has_work (cpu); -} +bool cpu_has_work (CPUState *cpu);/** * cpu_get_phys_page_attrs_debug:
softmmu/cpus.c +8 -0
@@ -251,6 +251,14 @@ void cpu_interrupt(CPUState *cpu, int mask) } } +bool cpu_has_work (CPUState *cpu) +{ +CPUClass *cc =CPU_GET_CLASS (cpu); + +g_assert (cc->has_work); +return cc->has_work (cpu); +} +static int do_vm_stop (RunState state,bool send_stop) {int ret =0 ;
Signature · 1 line
2.31.1
Re: [PATCH v3 03/30] hw/core: Un-inline cpu_has_work()
Quoted 8 lines · Philippe Mathieu-Daudé
We want to make
cpu_has_work()per-accelerator. Only declare its prototype and move its definition tosoftmmu/cpus.c.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- include/hw/core/cpu.h | 8 +------- softmmu/cpus.c | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-)
r~
PATCH v3 4/30 sysemu: Introduce AccelOpsClass::has_work()
In reply to Philippe Mathieu-DaudéIntroduce an accelerator-specific has_work() handler. Eventually call it from cpu_has_work().
--- include/sysemu/accel-ops.h | 5 +++++ softmmu/cpus.c | 3 +++ 2 files changed, 8 insertions(+)
include/sysemu/accel-ops.h +5 -0
@@ -31,6 +31,11 @@ struct AccelOpsClass {void (*create_vcpu_thread)(CPUState *cpu);/* MANDATORY NON-NULL */ void (*kick_vcpu_thread)(CPUState *cpu); +/** +* @has_work: Callback for checking if there is work to do. +*/ +bool (*has_work)(CPUState *cpu); +void (*synchronize_post_reset)(CPUState *cpu);void (*synchronize_post_init)(CPUState *cpu);void (*synchronize_state)(CPUState *cpu);
softmmu/cpus.c +3 -0
@@ -255,6 +255,9 @@ bool cpu_has_work(CPUState *cpu) {CPUClass *cc =CPU_GET_CLASS (cpu); +if (cpus_accel->has_work) { +return cpus_accel->has_work (cpu); + }g_assert (cc->has_work);return cc->has_work (cpu); }
Signature · 1 line
2.31.1
Re: [PATCH v3 04/30] sysemu: Introduce AccelOpsClass::has_work()
Quoted 8 lines · Philippe Mathieu-Daudé
Introduce an accelerator-specific
has_work()handler. Eventually call it fromcpu_has_work().Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- include/sysemu/accel-ops.h | 5 +++++ softmmu/cpus.c | 3 +++ 2 files changed, 8 insertions(+)
r~
PATCH v3 5/30 accel/kvm: Implement AccelOpsClass::has_work()
In reply to Philippe Mathieu-DaudéImplement KVM has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called.
--- accel/kvm/kvm-accel-ops.c | 6 ++++++ softmmu/cpus.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
accel/kvm/kvm-accel-ops.c +6 -0
@@ -74,6 +74,11 @@ static void kvm_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } +static bool kvm_cpu_has_work (CPUState *cpu) +{ +return kvm_halt_in_kernel (); +} +static void kvm_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc);
@@ -83,6 +88,7 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = kvm_cpu_synchronize_post_init; ops->synchronize_state = kvm_cpu_synchronize_state; ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm; + ops->has_work = kvm_cpu_has_work; }static const TypeInfo kvm_accel_ops_type = {
softmmu/cpus.c +1 -1
@@ -90,7 +90,7 @@ bool cpu_thread_is_idle(CPUState *cpu)return true; }if (!cpu->halted ||cpu_has_work (cpu) || -kvm_halt_in_kernel () ||whpx_apic_in_platform ()) { +whpx_apic_in_platform ()) {return false; }return true;
Signature · 1 line
2.31.1
Re: [PATCH v3 05/30] accel/kvm: Implement AccelOpsClass::has_work()
Quoted 9 lines · Philippe Mathieu-Daudé
Implement KVM
has_work()handler in AccelOpsClass and remove it fromcpu_thread_is_idle()sincecpu_has_work()is already called.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- accel/kvm/kvm-accel-ops.c | 6 ++++++ softmmu/cpus.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
r~
PATCH v3 6/30 accel/whpx: Implement AccelOpsClass::has_work()
In reply to Philippe Mathieu-DaudéImplement WHPX has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called.
--- softmmu/cpus.c | 4 +--- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-)
softmmu/cpus.c +1 -3
@@ -41,7 +41,6 @@#include "sysemu/replay.h" #include "sysemu/runstate.h" #include "sysemu/cpu-timers.h" -#include "sysemu/whpx.h" #include "hw/boards.h" #include "hw/hw.h" #include "trace.h"
@@ -89,8 +88,7 @@ bool cpu_thread_is_idle(CPUState *cpu)if (cpu_is_stopped (cpu)) {return true; } -if (!cpu->halted ||cpu_has_work (cpu) || -whpx_apic_in_platform ()) { +if (!cpu->halted ||cpu_has_work (cpu)) {return false; }return true;
target/i386/whpx/whpx-accel-ops.c +6 -0
@@ -83,6 +83,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) } } +static bool whpx_cpu_has_work (CPUState *cpu) +{ +return whpx_apic_in_platform (); +} +static void whpx_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc);
@@ -94,6 +99,7 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = whpx_cpu_synchronize_post_init; ops->synchronize_state = whpx_cpu_synchronize_state; ops->synchronize_pre_loadvm = whpx_cpu_synchronize_pre_loadvm; + ops->has_work = whpx_cpu_has_work; }static const TypeInfo whpx_accel_ops_type = {
Signature · 1 line
2.31.1
Re: [PATCH v3 06/30] accel/whpx: Implement AccelOpsClass::has_work()
Quoted 9 lines · Philippe Mathieu-Daudé
Implement WHPX
has_work()handler in AccelOpsClass and remove it fromcpu_thread_is_idle()sincecpu_has_work()is already called.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- softmmu/cpus.c | 4 +--- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-)
r~
PATCH v3 7/30 accel/tcg: Implement AccelOpsClass::has_work() as stub
In reply to Philippe Mathieu-DaudéAdd TCG target-specific has_work() handler in TCGCPUOps, and add tcg_cpu_has_work() as AccelOpsClass has_work() implementation.
--- include/hw/core/tcg-cpu-ops.h | 4 ++++ accel/tcg/tcg-accel-ops.c | 12 ++++++++++++ 2 files changed, 16 insertions(+)
include/hw/core/tcg-cpu-ops.h +4 -0
@@ -66,6 +66,10 @@ struct TCGCPUOps {void (*do_interrupt)(CPUState *cpu);#endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #ifdef CONFIG_SOFTMMU +/** +* @has_work: Callback for checking if there is work to do. +*/ +bool (*has_work)(CPUState *cpu);/** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */ bool (*cpu_exec_interrupt)(CPUState *cpu,int interrupt_request);/**
accel/tcg/tcg-accel-ops.c +12 -0
@@ -32,6 +32,7 @@#include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" +#include "hw/core/tcg-cpu-ops.h" #include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h"
@@ -73,6 +74,16 @@ int tcg_cpus_exec(CPUState *cpu)return ret; } +static bool tcg_cpu_has_work (CPUState *cpu) +{ +CPUClass *cc =CPU_GET_CLASS (cpu); + +if (!cc->tcg_ops->has_work) { +return false; + } +return cc->tcg_ops->has_work (cpu); +} +/* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt (CPUState *cpu,int mask) {
@@ -108,6 +119,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->kick_vcpu_thread = rr_kick_vcpu_thread; ops->handle_interrupt = tcg_handle_interrupt; } + ops->has_work = tcg_cpu_has_work; }static void tcg_accel_ops_class_init (ObjectClass *oc,void *data)
Signature · 1 line
2.31.1
Re: [PATCH v3 07/30] accel/tcg: Implement AccelOpsClass::has_work() as stub
Quoted 9 lines · Philippe Mathieu-Daudé
Add TCG target-specific
has_work()handler in TCGCPUOps, and addtcg_cpu_has_work()as AccelOpsClasshas_work()implementation.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- include/hw/core/tcg-cpu-ops.h | 4 ++++ accel/tcg/tcg-accel-ops.c | 12 ++++++++++++ 2 files changed, 16 insertions(+)
r~
PATCH v3 8/30 target/alpha: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/alpha/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/alpha/cpu.c +3 -1
@@ -33,6 +33,7 @@ static void alpha_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool alpha_cpu_has_work (CPUState *cs) {/* Here we are checking to see if the CPU should wake up from HALT.
@@ -47,6 +48,7 @@ static bool alpha_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_SMP | CPU_INTERRUPT_MCHK); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void alpha_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) {
@@ -221,6 +223,7 @@ static const struct TCGCPUOps alpha_tcg_ops = { .tlb_fill = alpha_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = alpha_cpu_has_work, .cpu_exec_interrupt = alpha_cpu_exec_interrupt, .do_interrupt = alpha_cpu_do_interrupt, .do_transaction_failed = alpha_cpu_do_transaction_failed,
@@ -238,7 +241,6 @@ static void alpha_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_realize); cc->class_by_name = alpha_cpu_class_by_name; - cc->has_work = alpha_cpu_has_work; cc->dump_state = alpha_cpu_dump_state; cc->set_pc = alpha_cpu_set_pc; cc->gdb_read_register = alpha_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 08/30] target/alpha: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/alpha/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/alpha/cpu.c +0
-0
target/alpha/cpu.c static void alpha_cpu_set_pc(CPUState *cs, vaddr value) · line 37
Quoted 5 lines
target/alpha/cpu.c +1
-0@@ -33,6 +33,7 @@ static void alpha_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool alpha_cpu_has_work (CPUState *cs)
Drop CONFIG_TCG for alpha; it's always true.
Otherwise,
r~
Re: [PATCH v3 08/30] target/alpha: Restrict has_work() handler to sysemu and TCG
Quoted 8 lines · Richard Henderson
Quoted 7 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
target/alpha/cpu.c| 4 +++-1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 11 lines
target/alpha/cpu.c static void alpha_cpu_set_pc(CPUState *cs, vaddr value) · line 36
Quoted 9 lines
target/alpha/cpu.c +0
-0@@ -33,6 +33,7 @@ static void alpha_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool alpha_cpu_has_work(CPUState *cs)Drop
CONFIG_TCGfor alpha; it's always true.
What is the rational? "Old" architectures (with no active / official hw development) are unlikely to add hardware acceleration, so TCG is the single one possible? Thus no need to clutter the code with obvious #ifdef'ry?
Quoted 5 lines
Otherwise,
Reviewed-by Richard Henderson <[email protected]>r~
Re: [PATCH v3 08/30] target/alpha: Restrict has_work() handler to sysemu and TCG
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 1 line
Drop
CONFIG_TCGfor alpha; it's always true.What is the rational? "Old" architectures (with no active / official hw development) are unlikely to add hardware acceleration, so TCG is the single one possible? Thus no need to clutter the code with obvious #ifdef'ry?
Correct. Broadly, if git grep CONFIG_TCG is empty in a subdirectory, don't add the first instance.
r~
PATCH v3 9/30 target/arm: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/arm/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
target/arm/cpu.c +5 -2
@@ -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;
Signature · 1 line
2.31.1
Re: [PATCH v3 09/30] target/arm: Restrict has_work() handler to sysemu and TCG
Quoted 6 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/arm/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
r~
PATCH v3 10/30 target/avr: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/avr/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/avr/cpu.c +3 -1
@@ -32,6 +32,7 @@ static void avr_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc_w = value /2 ;/* internally PC points to words */ } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool avr_cpu_has_work (CPUState *cs) {AVRCPU *cpu =AVR_CPU (cs);
@@ -40,6 +41,7 @@ static bool avr_cpu_has_work(CPUState *cs)return (cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_RESET )) && cpu_interrupts_enabled(env); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void avr_cpu_synchronize_from_tb (CPUState *cs,const TranslationBlock *tb)
@@ -198,6 +200,7 @@ static const struct TCGCPUOps avr_tcg_ops = { .tlb_fill = avr_cpu_tlb_fill,#ifndef CONFIG_USER_ONLY + .has_work = avr_cpu_has_work, .cpu_exec_interrupt = avr_cpu_exec_interrupt, .do_interrupt = avr_cpu_do_interrupt,#endif /* !CONFIG_USER_ONLY */
@@ -214,7 +217,6 @@ static void avr_cpu_class_init(ObjectClass *oc, void *data) cc->class_by_name = avr_cpu_class_by_name; - cc->has_work = avr_cpu_has_work; cc->dump_state = avr_cpu_dump_state; cc->set_pc = avr_cpu_set_pc; cc->memory_rw_debug = avr_cpu_memory_rw_debug;
Signature · 1 line
2.31.1
Re: [PATCH v3 10/30] target/avr: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/avr/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/avr/cpu.c +0
-0
target/avr/cpu.c static void avr_cpu_set_pc(CPUState *cs, vaddr value) · line 36
Quoted 5 lines
target/avr/cpu.c +1
-0@@ -32,6 +32,7 @@ static void avr_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc_w = value /2 ;/* internally PC points to words */ } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool avr_cpu_has_work (CPUState *cs)
No CONFIG_TCG or CONFIG_USER_ONLY test for avr.
Otherwise,
r~
PATCH v3 11/30 target/cris: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/cris/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/cris/cpu.c +3 -1
@@ -35,10 +35,12 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cris_cpu_has_work (CPUState *cs) {return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void cris_cpu_reset (DeviceState *dev) {
@@ -208,6 +210,7 @@ static const struct TCGCPUOps crisv10_tcg_ops = { .tlb_fill = cris_cpu_tlb_fill,#ifndef CONFIG_USER_ONLY + .has_work = cris_cpu_has_work, .cpu_exec_interrupt = cris_cpu_exec_interrupt, .do_interrupt = crisv10_cpu_do_interrupt,#endif /* !CONFIG_USER_ONLY */
@@ -294,7 +297,6 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_reset (dc, cris_cpu_reset, &ccc->parent_reset); cc->class_by_name = cris_cpu_class_by_name; - cc->has_work = cris_cpu_has_work; cc->dump_state = cris_cpu_dump_state; cc->set_pc = cris_cpu_set_pc; cc->gdb_read_register = cris_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 11/30] target/cris: Restrict has_work() handler to sysemu and TCG
Quoted 2 lines · Philippe Mathieu-Daudé
+#if
defined(CONFIG_TCG)&& !defined(CONFIG_USER_ONLY)
static boolcris_cpu_has_work(CPUState *cs)
No CONFIG_TCG for cris. Otherwise,
r~
PATCH v3 12/30 target/hexagon: Remove unused has_work() handler
In reply to Philippe Mathieu-Daudéhas_work() is sysemu specific, and Hexagon target only provides a linux-user implementation. Remove the unused hexagon_cpu_has_work().
--- target/hexagon/cpu.c | 6 ------ 1 file changed, 6 deletions(-)
target/hexagon/cpu.c +0 -6
@@ -189,11 +189,6 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *cs, env->gpr[HEX_REG_PC ] = tb->pc; } -static bool hexagon_cpu_has_work (CPUState *cs) -{ -return true; -} -void restore_state_to_opc (CPUHexagonState *env,TranslationBlock *tb,target_ulong *data) {
@@ -287,7 +282,6 @@ static void hexagon_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_reset (dc, hexagon_cpu_reset, &mcc->parent_reset); cc->class_by_name = hexagon_cpu_class_by_name; - cc->has_work = hexagon_cpu_has_work; cc->dump_state = hexagon_dump_state; cc->set_pc = hexagon_cpu_set_pc; cc->gdb_read_register = hexagon_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 12/30] target/hexagon: Remove unused has_work() handler
Quoted 7 lines · Philippe Mathieu-Daudé
has_work()is sysemu specific, and Hexagon target only provides a linux-user implementation. Remove the unusedhexagon_cpu_has_work().Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/hexagon/cpu.c | 6 ------ 1 file changed, 6 deletions(-)
r~
PATCH v3 13/30 target/hppa: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/hppa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/hppa/cpu.c +3 -1
@@ -60,10 +60,12 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, cpu->env.psw_n = (tb->flags &PSW_N ) !=0 ; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool hppa_cpu_has_work (CPUState *cs) {return cs->interrupt_request &CPU_INTERRUPT_HARD ; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void hppa_cpu_disas_set_info (CPUState *cs,disassemble_info *info) {
@@ -147,6 +149,7 @@ static const struct TCGCPUOps hppa_tcg_ops = { .tlb_fill = hppa_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = hppa_cpu_has_work, .cpu_exec_interrupt = hppa_cpu_exec_interrupt, .do_interrupt = hppa_cpu_do_interrupt, .do_unaligned_access = hppa_cpu_do_unaligned_access,
@@ -163,7 +166,6 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_realize); cc->class_by_name = hppa_cpu_class_by_name; - cc->has_work = hppa_cpu_has_work; cc->dump_state = hppa_cpu_dump_state; cc->set_pc = hppa_cpu_set_pc; cc->gdb_read_register = hppa_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 13/30] target/hppa: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/hppa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/hppa/cpu.c +0
-0
target/hppa/cpu.c static void hppa_cpu_synchronize_from_tb(CPUState *cs, · line 64
Quoted 5 lines
target/hppa/cpu.c +1
-0@@ -60,10 +60,12 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, cpu->env.psw_n = (tb->flags &PSW_N ) !=0 ; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool hppa_cpu_has_work (CPUState *cs)
No CONFIG_TCG, otherwise
r~
PATCH v3 14/30 target/i386: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/i386/cpu.c | 6 ------ target/i386/tcg/tcg-cpu.c | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-)
target/i386/cpu.c +0 -6
@@ -6548,11 +6548,6 @@ int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request)return 0 ; } -static bool x86_cpu_has_work (CPUState *cs) -{ -return x86_cpu_pending_interrupt (cs, cs->interrupt_request) !=0 ; -} -static void x86_disas_set_info (CPUState *cs,disassemble_info *info) {X86CPU *cpu =X86_CPU (cs);
@@ -6757,7 +6752,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->class_by_name = x86_cpu_class_by_name; cc->parse_features = x86_cpu_parse_featurestr; - cc->has_work = x86_cpu_has_work; cc->dump_state = x86_cpu_dump_state; cc->set_pc = x86_cpu_set_pc; cc->gdb_read_register = x86_cpu_gdb_read_register;
target/i386/tcg/tcg-cpu.c +7 -1
@@ -55,6 +55,11 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs, }#ifndef CONFIG_USER_ONLY +static bool x86_cpu_has_work (CPUState *cs) +{ +return x86_cpu_pending_interrupt (cs, cs->interrupt_request) !=0 ; +} +static bool x86_debug_check_breakpoint (CPUState *cs) {X86CPU *cpu =X86_CPU (cs);
@@ -63,7 +68,7 @@ static bool x86_debug_check_breakpoint(CPUState *cs)/* RF disables all architectural breakpoints. */ return !(env->eflags & RF_MASK); } -#endif +#endif /* CONFIG_USER_ONLY */ #include "hw/core/tcg-cpu-ops.h"
@@ -76,6 +81,7 @@ static const struct TCGCPUOps x86_tcg_ops = {#ifdef CONFIG_USER_ONLY .fake_user_exception = x86_cpu_do_interrupt, #else + .has_work = x86_cpu_has_work, .do_interrupt = x86_cpu_do_interrupt, .cpu_exec_interrupt = x86_cpu_exec_interrupt, .debug_excp_handler = breakpoint_handler,
Signature · 1 line
2.31.1
Re: [PATCH v3 14/30] target/i386: Restrict has_work() handler to sysemu and TCG
Quoted 7 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/i386/cpu.c | 6 ------ target/i386/tcg/tcg-cpu.c | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-)
r~
PATCH v3 15/30 target/m68k: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/m68k/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/m68k/cpu.c +3 -1
@@ -31,10 +31,12 @@ static void m68k_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool m68k_cpu_has_work (CPUState *cs) {return cs->interrupt_request &CPU_INTERRUPT_HARD ; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void m68k_set_feature (CPUM68KState *env,int feature) {
@@ -518,6 +520,7 @@ static const struct TCGCPUOps m68k_tcg_ops = { .tlb_fill = m68k_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = m68k_cpu_has_work, .cpu_exec_interrupt = m68k_cpu_exec_interrupt, .do_interrupt = m68k_cpu_do_interrupt, .do_transaction_failed = m68k_cpu_transaction_failed,
@@ -535,7 +538,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_reset (dc, m68k_cpu_reset, &mcc->parent_reset); cc->class_by_name = m68k_cpu_class_by_name; - cc->has_work = m68k_cpu_has_work; cc->dump_state = m68k_cpu_dump_state; cc->set_pc = m68k_cpu_set_pc; cc->gdb_read_register = m68k_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 15/30] target/m68k: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/m68k/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/m68k/cpu.c +0
-0
target/m68k/cpu.c static void m68k_cpu_set_pc(CPUState *cs, vaddr value) · line 35
Quoted 5 lines
target/m68k/cpu.c +1
-0@@ -31,10 +31,12 @@ static void m68k_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool m68k_cpu_has_work (CPUState *cs)
No CONFIG_TCG, otherwise,
r~
PATCH v3 16/30 target/microblaze: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/microblaze/cpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
target/microblaze/cpu.c +6 -4
@@ -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;
Signature · 1 line
2.31.1
Re: [PATCH v3 16/30] target/microblaze: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/microblaze/cpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)target/microblaze/cpu.c +0
-0
target/microblaze/cpu.c static void mb_cpu_synchronize_from_tb(CPUState *cs, · line 98
Quoted 7 lines
target/microblaze/cpu.c +3
-0@@ -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)
No CONFIG_TCG, otherwise,
r~
PATCH v3 17/30 target/mips: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/mips/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/mips/cpu.c +3 -1
@@ -128,6 +128,7 @@ static void mips_cpu_set_pc(CPUState *cs, vaddr value)mips_env_set_pc (&cpu->env, value); } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool mips_cpu_has_work (CPUState *cs) {MIPSCPU *cpu =MIPS_CPU (cs);
@@ -172,6 +173,7 @@ static bool mips_cpu_has_work(CPUState *cs) }return has_work; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ #include "cpu-defs.c.inc"
@@ -542,6 +544,7 @@ static const struct TCGCPUOps mips_tcg_ops = { .tlb_fill = mips_cpu_tlb_fill,#if !defined(CONFIG_USER_ONLY ) + .has_work = mips_cpu_has_work, .cpu_exec_interrupt = mips_cpu_exec_interrupt, .do_interrupt = mips_cpu_do_interrupt, .do_transaction_failed = mips_cpu_do_transaction_failed,
@@ -563,7 +566,6 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)device_class_set_props (dc, mips_cpu_properties); cc->class_by_name = mips_cpu_class_by_name; - cc->has_work = mips_cpu_has_work; cc->dump_state = mips_cpu_dump_state; cc->set_pc = mips_cpu_set_pc; cc->gdb_read_register = mips_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 17/30] target/mips: Restrict has_work() handler to sysemu and TCG
Quoted 6 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/mips/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
r~
PATCH v3 18/30 target/nios2: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/nios2/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/nios2/cpu.c +3 -1
@@ -34,10 +34,12 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value) env->regs[R_PC ] = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool nios2_cpu_has_work (CPUState *cs) {return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void nios2_cpu_reset (DeviceState *dev) {
@@ -223,6 +225,7 @@ static const struct TCGCPUOps nios2_tcg_ops = { .tlb_fill = nios2_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = nios2_cpu_has_work, .cpu_exec_interrupt = nios2_cpu_exec_interrupt, .do_interrupt = nios2_cpu_do_interrupt, .do_unaligned_access = nios2_cpu_do_unaligned_access,
@@ -241,7 +244,6 @@ static void nios2_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_reset (dc, nios2_cpu_reset, &ncc->parent_reset); cc->class_by_name = nios2_cpu_class_by_name; - cc->has_work = nios2_cpu_has_work; cc->dump_state = nios2_cpu_dump_state; cc->set_pc = nios2_cpu_set_pc; cc->disas_set_info = nios2_cpu_disas_set_info;
Signature · 1 line
2.31.1
Re: [PATCH v3 18/30] target/nios2: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/nios2/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/nios2/cpu.c +0
-0
target/nios2/cpu.c static void nios2_cpu_set_pc(CPUState *cs, vaddr value) · line 38
Quoted 5 lines
target/nios2/cpu.c +1
-0@@ -34,10 +34,12 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value) env->regs[R_PC ] = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool nios2_cpu_has_work (CPUState *cs)
No CONFIG_TCG, otherwise,
r~
PATCH v3 19/30 target/openrisc: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/openrisc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/openrisc/cpu.c +3 -1
@@ -30,11 +30,13 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.dflag =0 ; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool openrisc_cpu_has_work (CPUState *cs) {return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_TIMER ); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void openrisc_disas_set_info (CPUState *cpu,disassemble_info *info) {
@@ -189,6 +191,7 @@ static const struct TCGCPUOps openrisc_tcg_ops = { .tlb_fill = openrisc_cpu_tlb_fill,#ifndef CONFIG_USER_ONLY + .has_work = openrisc_cpu_has_work, .cpu_exec_interrupt = openrisc_cpu_exec_interrupt, .do_interrupt = openrisc_cpu_do_interrupt,#endif /* !CONFIG_USER_ONLY */
@@ -205,7 +208,6 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_reset (dc, openrisc_cpu_reset, &occ->parent_reset); cc->class_by_name = openrisc_cpu_class_by_name; - cc->has_work = openrisc_cpu_has_work; cc->dump_state = openrisc_cpu_dump_state; cc->set_pc = openrisc_cpu_set_pc; cc->gdb_read_register = openrisc_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 19/30] target/openrisc: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/openrisc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/openrisc/cpu.c +0
-0
target/openrisc/cpu.c static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) · line 34
Quoted 5 lines
target/openrisc/cpu.c +1
-0@@ -30,11 +30,13 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.dflag =0 ; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool openrisc_cpu_has_work (CPUState *cs)
No CONFIG_TCG, otherwise,
r~
PATCH v3 20/30 target/ppc: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/ppc/cpu_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/ppc/cpu_init.c +3 -1
@@ -8790,6 +8790,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool ppc_cpu_has_work (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);
@@ -8797,6 +8798,7 @@ static bool ppc_cpu_has_work(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void ppc_cpu_reset (DeviceState *dev) {
@@ -9017,6 +9019,7 @@ static const struct TCGCPUOps ppc_tcg_ops = { .tlb_fill = ppc_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = ppc_cpu_has_work, .cpu_exec_interrupt = ppc_cpu_exec_interrupt, .do_interrupt = ppc_cpu_do_interrupt, .cpu_exec_enter = ppc_cpu_exec_enter,
@@ -9042,7 +9045,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_reset (dc, ppc_cpu_reset, &pcc->parent_reset); cc->class_by_name = ppc_cpu_class_by_name; - cc->has_work = ppc_cpu_has_work; cc->dump_state = ppc_cpu_dump_state; cc->set_pc = ppc_cpu_set_pc; cc->gdb_read_register = ppc_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 20/30] target/ppc: Restrict has_work() handler to sysemu and TCG
Quoted 3 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 40 lines
--- target/ppc/cpu_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/ppc/cpu_init.c +3
-1@@ -8790,6 +8790,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool ppc_cpu_has_work (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);@@ -8797,6 +8798,7 @@ static bool ppc_cpu_has_work(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void ppc_cpu_reset (DeviceState *dev) {@@ -9017,6 +9019,7 @@ static const struct TCGCPUOps ppc_tcg_ops = { .tlb_fill = ppc_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = ppc_cpu_has_work, .cpu_exec_interrupt = ppc_cpu_exec_interrupt, .do_interrupt = ppc_cpu_do_interrupt, .cpu_exec_enter = ppc_cpu_exec_enter,@@ -9042,7 +9045,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_reset (dc, ppc_cpu_reset, &pcc->parent_reset); cc->class_by_name = ppc_cpu_class_by_name; - cc->has_work = ppc_cpu_has_work; cc->dump_state = ppc_cpu_dump_state; cc->set_pc = ppc_cpu_set_pc; cc->gdb_read_register = ppc_cpu_gdb_read_register;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v3 20/30] target/ppc: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéQuoted 6 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/ppc/cpu_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
r~
PATCH v3 21/30 target/ppc: Introduce PowerPCCPUClass::has_work()
In reply to Philippe Mathieu-DaudéEach POWER cpu has its own has_work() implementation. Instead of overloading CPUClass on each PowerPCCPUClass init, register the generic ppc_cpu_has_work() handler, and have it call the POWER specific has_work().
--- target/ppc/cpu-qom.h | 3 +++ target/ppc/cpu_init.c | 26 ++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-)
target/ppc/cpu-qom.h +3 -0
@@ -189,6 +189,9 @@ struct PowerPCCPUClass {int bfd_mach;uint32_t l1_dcache_size, l1_icache_size;#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_TCG +bool (*has_work)(CPUState *cpu); +#endif /* CONFIG_TCG */ unsigned int gdb_num_sprs;const char *gdb_spr_xml;#endif
target/ppc/cpu_init.c +18 -8
@@ -7583,6 +7583,7 @@ static bool ppc_pvr_match_power7(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER7 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);
@@ -7616,12 +7617,12 @@ static bool cpu_has_work_POWER7(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER7 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER7" ; dc->desc ="POWER7" ;
@@ -7630,7 +7631,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER7; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER7; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
@@ -7673,6 +7673,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->lpcr_pm =LPCR_P7_PECE0 |LPCR_P7_PECE1 |LPCR_P7_PECE2 ; pcc->mmu_model =POWERPC_MMU_2_06 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER7; pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =32 ;#endif
@@ -7743,6 +7744,7 @@ static bool ppc_pvr_match_power8(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER8 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);
@@ -7784,12 +7786,12 @@ static bool cpu_has_work_POWER8(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER8 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER8" ; dc->desc ="POWER8" ;
@@ -7798,7 +7800,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =PCR_COMPAT_2_07 |PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER8; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER8; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
@@ -7848,6 +7849,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)LPCR_P8_PECE3 |LPCR_P8_PECE4 ; pcc->mmu_model =POWERPC_MMU_2_07 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER8; pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =32 ; pcc->n_host_threads =8 ;
@@ -7941,6 +7943,7 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER9 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);
@@ -7998,12 +8001,12 @@ static bool cpu_has_work_POWER9(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER9 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER9" ; dc->desc ="POWER9" ;
@@ -8013,7 +8016,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER9; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER9; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
@@ -8062,6 +8064,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) pcc->lpcr_pm =LPCR_PDEE |LPCR_HDEE |LPCR_EEE |LPCR_DEE |LPCR_OEE ; pcc->mmu_model =POWERPC_MMU_3_00 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER9;/* segment page size remain the same */ pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->radix_page_info = &POWER9_radix_page_info;
@@ -8150,6 +8153,7 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER10 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);
@@ -8207,12 +8211,12 @@ static bool cpu_has_work_POWER10(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER10 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER10" ; dc->desc ="POWER10" ;
@@ -8223,7 +8227,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER10; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER10; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
@@ -8275,6 +8278,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) pcc->lpcr_pm =LPCR_PDEE |LPCR_HDEE |LPCR_EEE |LPCR_DEE |LPCR_OEE ; pcc->mmu_model =POWERPC_MMU_3_00 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER10;/* segment page size remain the same */ pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->radix_page_info = &POWER10_radix_page_info;
@@ -8796,6 +8800,12 @@ static bool ppc_cpu_has_work(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +if (cs->halted) { +PowerPCCPUClass *pcc =POWERPC_CPU_GET_CLASS (cpu); + +return pcc->has_work (cs); + } + return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
Signature · 1 line
2.31.1
Re: [PATCH v3 21/30] target/ppc: Introduce PowerPCCPUClass::has_work()
Quoted 4 lines · Philippe Mathieu-Daudé
Each POWER cpu has its own
has_work()implementation. Instead of overloading CPUClass on each PowerPCCPUClass init, register the genericppc_cpu_has_work()handler, and have it call the POWER specifichas_work().
I don't quite see the rationale for introducing a second layer of indirection here. What's wrong with switching the base has_work for each cpu variant?
Quoted 190 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/ppc/cpu-qom.h | 3 +++ target/ppc/cpu_init.c | 26 ++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-)target/ppc/cpu-qom.h +3
-0@@ -189,6 +189,9 @@ struct PowerPCCPUClass {int bfd_mach;uint32_t l1_dcache_size, l1_icache_size;#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_TCG +bool (*has_work)(CPUState *cpu); +#endif /* CONFIG_TCG */ unsigned int gdb_num_sprs;const char *gdb_spr_xml;#endif target/ppc/cpu_init.c +18
-8@@ -7583,6 +7583,7 @@ static bool ppc_pvr_match_power7(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER7 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);@@ -7616,12 +7617,12 @@ static bool cpu_has_work_POWER7(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER7 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER7" ; dc->desc ="POWER7" ;@@ -7630,7 +7631,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER7; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER7; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |@@ -7673,6 +7673,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->lpcr_pm =LPCR_P7_PECE0 |LPCR_P7_PECE1 |LPCR_P7_PECE2 ; pcc->mmu_model =POWERPC_MMU_2_06 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER7; pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =32 ;#endif @@ -7743,6 +7744,7 @@ static bool ppc_pvr_match_power8(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER8 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);@@ -7784,12 +7786,12 @@ static bool cpu_has_work_POWER8(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER8 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER8" ; dc->desc ="POWER8" ;@@ -7798,7 +7800,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =PCR_COMPAT_2_07 |PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER8; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER8; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |@@ -7848,6 +7849,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)LPCR_P8_PECE3 |LPCR_P8_PECE4 ; pcc->mmu_model =POWERPC_MMU_2_07 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER8; pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =32 ; pcc->n_host_threads =8 ;@@ -7941,6 +7943,7 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER9 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);@@ -7998,12 +8001,12 @@ static bool cpu_has_work_POWER9(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER9 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER9" ; dc->desc ="POWER9" ;@@ -8013,7 +8016,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER9; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER9; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |@@ -8062,6 +8064,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) pcc->lpcr_pm =LPCR_PDEE |LPCR_HDEE |LPCR_EEE |LPCR_DEE |LPCR_OEE ; pcc->mmu_model =POWERPC_MMU_3_00 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER9;/* segment page size remain the same */ pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->radix_page_info = &POWER9_radix_page_info;@@ -8150,6 +8153,7 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass *pcc, uint32_t pvr)return false; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool cpu_has_work_POWER10 (CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);@@ -8207,12 +8211,12 @@ static bool cpu_has_work_POWER10(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ POWERPC_FAMILY (POWER10 )(ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc);PowerPCCPUClass *pcc =POWERPC_CPU_CLASS (oc); -CPUClass *cc =CPU_CLASS (oc); dc->fw_name ="PowerPC,POWER10" ; dc->desc ="POWER10" ;@@ -8223,7 +8227,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER10; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER10; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |@@ -8275,6 +8278,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) pcc->lpcr_pm =LPCR_PDEE |LPCR_HDEE |LPCR_EEE |LPCR_DEE |LPCR_OEE ; pcc->mmu_model =POWERPC_MMU_3_00 ;#if defined(CONFIG_SOFTMMU ) + pcc->has_work = cpu_has_work_POWER10;/* segment page size remain the same */ pcc->hash64_opts = &ppc_hash64_opts_POWER7; pcc->radix_page_info = &POWER10_radix_page_info;@@ -8796,6 +8800,12 @@ static bool ppc_cpu_has_work(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +if (cs->halted) { +PowerPCCPUClass *pcc =POWERPC_CPU_GET_CLASS (cpu); + +return pcc->has_work (cs); + } + return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v3 21/30] target/ppc: Introduce PowerPCCPUClass::has_work()
Quoted 17 lines · David Gibson
Quoted 4 lines · Philippe Mathieu-Daudé
Each POWER cpu has its own
has_work()implementation. Instead of overloading CPUClass on each PowerPCCPUClass init, register the genericppc_cpu_has_work()handler, and have it call the POWER specifichas_work().I don't quite see the rationale for introducing a second layer of indirection here. What's wrong with switching the base
has_workfor each cpu variant?Quoted 6 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/ppc/cpu-qom.h | 3 +++ target/ppc/cpu_init.c | 26 ++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-)
Quoted 6 lines
target/ppc/cpu_init.c static bool ppc_cpu_has_work(CPUState *cs) · line 8804
Quoted 6 lines
target/ppc/cpu_init.c +2
-0@@ -8796,6 +8800,12 @@ static bool ppc_cpu_has_work(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +if (cs->halted) { +PowerPCCPUClass *pcc =POWERPC_CPU_GET_CLASS (cpu);
Maybe I should have kept the 'if (cs->halted)' for the next patch, simply dispatch here, then in the next patch the code simplification is more apparent. I thought this approach would involve less #ifdef'ry but haven't checked the other way around. Will do now.
Quoted 7 lines
Quoted 6 lines
target/ppc/cpu_init.c +3
-0+ return pcc->has_work(cs); + } +return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
Re: [PATCH v3 21/30] target/ppc: Introduce PowerPCCPUClass::has_work()
In reply to David GibsonQuoted 9 lines · David Gibson
Quoted 4 lines · Philippe Mathieu-Daudé
Each POWER cpu has its own
has_work()implementation. Instead of overloading CPUClass on each PowerPCCPUClass init, register the genericppc_cpu_has_work()handler, and have it call the POWER specifichas_work().I don't quite see the rationale for introducing a second layer of indirection here. What's wrong with switching the base
has_workfor each cpu variant?
We're moving the hook from CPUState to TCGCPUOps.
Phil was trying to avoid creating N versions of
static const struct TCGCPUOps ppc_tcg_ops = {
...
};A plausible alternative is to remove the const from this struct and modify it, just as we do for CPUState, on the assumption that we cannot mix and match ppc cpu types in any one machine.
r~
Re: [PATCH v3 21/30] target/ppc: Introduce PowerPCCPUClass::has_work()
Quoted 11 lines · Richard Henderson
Quoted 9 lines · David Gibson
Quoted 4 lines · Philippe Mathieu-Daudé
Each POWER cpu has its own
has_work()implementation. Instead of overloading CPUClass on each PowerPCCPUClass init, register the genericppc_cpu_has_work()handler, and have it call the POWER specifichas_work().I don't quite see the rationale for introducing a second layer of indirection here. What's wrong with switching the base
has_workfor each cpu variant?
Quoted 6 lines
We're moving the hook from CPUState to TCGCPUOps.
Phil was trying to avoid creating N versions ofstatic const struct TCGCPUOps
ppc_tcg_ops= {
...
};
Ah yes this is the reason! Too many context switching so I forgot about it.
Quoted 3 lines
A plausible alternative is to remove the const from this struct and modify it, just as we do for CPUState, on the assumption that we cannot mix and match ppc cpu types in any one machine.
I thought about this case and remembered how it works on the ARM arch, i.e. ZynqMP machine uses both Cortex-R5F and Cortex-A53. Even if no similar PPC machine exists, IMHO we should try to generally allow to possibility to experiment machine with different CPUs. Restricting it on PPC goes the other way around. Thoughts?
Re: [PATCH v3 21/30] target/ppc: Introduce PowerPCCPUClass::has_work()
Quoted 26 lines · Philippe Mathieu-Daudé
Quoted 11 lines · Richard Henderson
Quoted 9 lines · David Gibson
Quoted 4 lines · Philippe Mathieu-Daudé
Each POWER cpu has its own
has_work()implementation. Instead of overloading CPUClass on each PowerPCCPUClass init, register the genericppc_cpu_has_work()handler, and have it call the POWER specifichas_work().I don't quite see the rationale for introducing a second layer of indirection here. What's wrong with switching the base
has_workfor each cpu variant?Quoted 6 lines
We're moving the hook from CPUState to TCGCPUOps.
Phil was trying to avoid creating N versions ofstatic const struct TCGCPUOps
ppc_tcg_ops= {
...
};Ah yes this is the reason! Too many context switching so I forgot about it.
Quoted 3 lines
A plausible alternative is to remove the const from this struct and modify it, just as we do for CPUState, on the assumption that we cannot mix and match ppc cpu types in any one machine.
Quoted 5 lines
I thought about this case and remembered how it works on the ARM arch, i.e. ZynqMP machine uses both Cortex-R5F and Cortex-A53. Even if no similar PPC machine exists, IMHO we should try to generally allow to possibility to experiment machine with different CPUs. Restricting it on PPC goes the other way around. Thoughts?
I'm running out of ideas to do avoid the indirection and multiple copies of TCGCPUOps. I'm not giving up, I suppose I'm simply not seeing it... David, any suggestions?
Re: [PATCH v3 21/30] target/ppc: Introduce PowerPCCPUClass::has_work()
Quoted 33 lines · Philippe Mathieu-Daudé
Quoted 26 lines · Philippe Mathieu-Daudé
Quoted 11 lines · Richard Henderson
Quoted 9 lines · David Gibson
Quoted 4 lines · Philippe Mathieu-Daudé
Each POWER cpu has its own
has_work()implementation. Instead of overloading CPUClass on each PowerPCCPUClass init, register the genericppc_cpu_has_work()handler, and have it call the POWER specifichas_work().I don't quite see the rationale for introducing a second layer of indirection here. What's wrong with switching the base
has_workfor each cpu variant?Quoted 6 lines
We're moving the hook from CPUState to TCGCPUOps.
Phil was trying to avoid creating N versions ofstatic const struct TCGCPUOps
ppc_tcg_ops= {
...
};Ah yes this is the reason! Too many context switching so I forgot about it.
Quoted 3 lines
A plausible alternative is to remove the const from this struct and modify it, just as we do for CPUState, on the assumption that we cannot mix and match ppc cpu types in any one machine.
Quoted 5 lines
I thought about this case and remembered how it works on the ARM arch, i.e. ZynqMP machine uses both Cortex-R5F and Cortex-A53. Even if no similar PPC machine exists, IMHO we should try to generally allow to possibility to experiment machine with different CPUs. Restricting it on PPC goes the other way around. Thoughts?
Quoted 3 lines
I'm running out of ideas to do avoid the indirection and multiple copies of TCGCPUOps. I'm not giving up, I suppose I'm simply not seeing it... David, any suggestions?
I think multiple copies of TCGCPUOps is the solution. Macro-ized, perhaps, so that the amount of typing is minimal across the versions.
r~
PATCH v3 22/30 target/ppc: Simplify has_work() handlers
In reply to Philippe Mathieu-DaudéThe common ppc_cpu_has_work() handler already checks for cs->halted, so we can simplify all callees.
--- target/ppc/cpu_init.c | 294 ++++++++++++++++++++---------------------- 1 file changed, 138 insertions(+), 156 deletions(-)
target/ppc/cpu_init.c +138 -156
@@ -7589,33 +7589,29 @@ static bool cpu_has_work_POWER7(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; -if (cs->halted) { -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { -return false; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && - (env->spr[SPR_LPCR ] &LPCR_P7_PECE0 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && - (env->spr[SPR_LPCR ] &LPCR_P7_PECE1 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK )) && - (env->spr[SPR_LPCR ] &LPCR_P7_PECE2 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HMI )) && - (env->spr[SPR_LPCR ] &LPCR_P7_PECE2 )) { -return true; - } -if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { -return true; - } +if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) {return false; - }else { -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && + (env->spr[SPR_LPCR ] &LPCR_P7_PECE0 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && + (env->spr[SPR_LPCR ] &LPCR_P7_PECE1 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK )) && + (env->spr[SPR_LPCR ] &LPCR_P7_PECE2 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HMI )) && + (env->spr[SPR_LPCR ] &LPCR_P7_PECE2 )) { +return true; + } +if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { +return true; + } + return false; }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
@@ -7750,41 +7746,37 @@ static bool cpu_has_work_POWER8(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; -if (cs->halted) { -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { -return false; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && - (env->spr[SPR_LPCR ] &LPCR_P8_PECE2 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && - (env->spr[SPR_LPCR ] &LPCR_P8_PECE3 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK )) && - (env->spr[SPR_LPCR ] &LPCR_P8_PECE4 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HMI )) && - (env->spr[SPR_LPCR ] &LPCR_P8_PECE4 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DOORBELL )) && - (env->spr[SPR_LPCR ] &LPCR_P8_PECE0 )) { -return true; - } -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HDOORBELL )) && - (env->spr[SPR_LPCR ] &LPCR_P8_PECE1 )) { -return true; - } -if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { -return true; - } +if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) {return false; - }else { -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && + (env->spr[SPR_LPCR ] &LPCR_P8_PECE2 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && + (env->spr[SPR_LPCR ] &LPCR_P8_PECE3 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK )) && + (env->spr[SPR_LPCR ] &LPCR_P8_PECE4 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HMI )) && + (env->spr[SPR_LPCR ] &LPCR_P8_PECE4 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DOORBELL )) && + (env->spr[SPR_LPCR ] &LPCR_P8_PECE0 )) { +return true; + } +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HDOORBELL )) && + (env->spr[SPR_LPCR ] &LPCR_P8_PECE1 )) { +return true; + } +if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { +return true; + } + return false; }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
@@ -7948,58 +7940,53 @@ static bool cpu_has_work_POWER9(CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +uint64_t psscr = env->spr[SPR_PSSCR ]; -if (cs->halted) { -uint64_t psscr = env->spr[SPR_PSSCR ]; - -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { -return false; - } - -/* If EC is clear, just return true on any pending interrupt */ -if (!(psscr &PSSCR_EC )) { -return true; - } -/* External Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && - (env->spr[SPR_LPCR ] &LPCR_EEE )) { -bool heic = !!(env->spr[SPR_LPCR ] &LPCR_HEIC ); -if (heic ==0 || !msr_hv || msr_pr) { -return true; - } - } -/* Decrementer Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && - (env->spr[SPR_LPCR ] &LPCR_DEE )) { -return true; - } -/* Machine Check or Hypervisor Maintenance Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK | -1u <<PPC_INTERRUPT_HMI )) && (env->spr[SPR_LPCR ] &LPCR_OEE )) { -return true; - } -/* Privileged Doorbell Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DOORBELL )) && - (env->spr[SPR_LPCR ] &LPCR_PDEE )) { -return true; - } -/* Hypervisor Doorbell Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HDOORBELL )) && - (env->spr[SPR_LPCR ] &LPCR_HDEE )) { -return true; - } -/* Hypervisor virtualization exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HVIRT )) && - (env->spr[SPR_LPCR ] &LPCR_HVEE )) { -return true; - } -if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { -return true; - } +if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) {return false; - }else { -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } + +/* If EC is clear, just return true on any pending interrupt */ +if (!(psscr &PSSCR_EC )) { +return true; + } +/* External Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && + (env->spr[SPR_LPCR ] &LPCR_EEE )) { +bool heic = !!(env->spr[SPR_LPCR ] &LPCR_HEIC ); +if (heic ==0 || !msr_hv || msr_pr) { +return true; + } + } +/* Decrementer Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && + (env->spr[SPR_LPCR ] &LPCR_DEE )) { +return true; + } +/* Machine Check or Hypervisor Maintenance Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK | +1u <<PPC_INTERRUPT_HMI )) && (env->spr[SPR_LPCR ] &LPCR_OEE )) { +return true; + } +/* Privileged Doorbell Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DOORBELL )) && + (env->spr[SPR_LPCR ] &LPCR_PDEE )) { +return true; + } +/* Hypervisor Doorbell Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HDOORBELL )) && + (env->spr[SPR_LPCR ] &LPCR_HDEE )) { +return true; + } +/* Hypervisor virtualization exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HVIRT )) && + (env->spr[SPR_LPCR ] &LPCR_HVEE )) { +return true; + } +if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { +return true; + } +return false; }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
@@ -8158,58 +8145,53 @@ static bool cpu_has_work_POWER10(CPUState *cs) {PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +uint64_t psscr = env->spr[SPR_PSSCR ]; -if (cs->halted) { -uint64_t psscr = env->spr[SPR_PSSCR ]; - -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { -return false; - } - -/* If EC is clear, just return true on any pending interrupt */ -if (!(psscr &PSSCR_EC )) { -return true; - } -/* External Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && - (env->spr[SPR_LPCR ] &LPCR_EEE )) { -bool heic = !!(env->spr[SPR_LPCR ] &LPCR_HEIC ); -if (heic ==0 || !msr_hv || msr_pr) { -return true; - } - } -/* Decrementer Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && - (env->spr[SPR_LPCR ] &LPCR_DEE )) { -return true; - } -/* Machine Check or Hypervisor Maintenance Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK | -1u <<PPC_INTERRUPT_HMI )) && (env->spr[SPR_LPCR ] &LPCR_OEE )) { -return true; - } -/* Privileged Doorbell Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DOORBELL )) && - (env->spr[SPR_LPCR ] &LPCR_PDEE )) { -return true; - } -/* Hypervisor Doorbell Exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HDOORBELL )) && - (env->spr[SPR_LPCR ] &LPCR_HDEE )) { -return true; - } -/* Hypervisor virtualization exception */ -if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HVIRT )) && - (env->spr[SPR_LPCR ] &LPCR_HVEE )) { -return true; - } -if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { -return true; - } +if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) {return false; - }else { -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } + +/* If EC is clear, just return true on any pending interrupt */ +if (!(psscr &PSSCR_EC )) { +return true; + } +/* External Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_EXT )) && + (env->spr[SPR_LPCR ] &LPCR_EEE )) { +bool heic = !!(env->spr[SPR_LPCR ] &LPCR_HEIC ); +if (heic ==0 || !msr_hv || msr_pr) { +return true; + } + } +/* Decrementer Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DECR )) && + (env->spr[SPR_LPCR ] &LPCR_DEE )) { +return true; + } +/* Machine Check or Hypervisor Maintenance Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_MCK | +1u <<PPC_INTERRUPT_HMI )) && (env->spr[SPR_LPCR ] &LPCR_OEE )) { +return true; + } +/* Privileged Doorbell Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_DOORBELL )) && + (env->spr[SPR_LPCR ] &LPCR_PDEE )) { +return true; + } +/* Hypervisor Doorbell Exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HDOORBELL )) && + (env->spr[SPR_LPCR ] &LPCR_HDEE )) { +return true; + } +/* Hypervisor virtualization exception */ +if ((env->pending_interrupts & (1u <<PPC_INTERRUPT_HVIRT )) && + (env->spr[SPR_LPCR ] &LPCR_HVEE )) { +return true; + } +if (env->pending_interrupts & (1u <<PPC_INTERRUPT_RESET )) { +return true; + } +return false; }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
Signature · 1 line
2.31.1
Re: [PATCH v3 22/30] target/ppc: Simplify has_work() handlers
Quoted 7 lines · Philippe Mathieu-Daudé
The common
ppc_cpu_has_work()handler already checks forcs->halted, so we can simplify all callees.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/ppc/cpu_init.c | 294 ++++++++++++++++++++---------------------- 1 file changed, 138 insertions(+), 156 deletions(-)
Well, I'm not actually a fan of this; I'd rather the outer function merely dispatch here, or preferably arrange to arrive here to begin.
r~
PATCH v3 23/30 target/riscv: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/riscv/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
target/riscv/cpu.c +3 -5
@@ -335,9 +335,9 @@ static void riscv_cpu_synchronize_from_tb(CPUState *cs, env->pc = tb->pc; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool riscv_cpu_has_work (CPUState *cs) { -#ifndef CONFIG_USER_ONLY RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env;/*
@@ -345,10 +345,8 @@ static bool riscv_cpu_has_work(CPUState *cs)* mode and delegation registers, but respect individual enables */ return (env->mip & env->mie) != 0; -#else -return true; -#endif } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ void restore_state_to_opc (CPURISCVState *env,TranslationBlock *tb,target_ulong *data)
@@ -647,6 +645,7 @@ static const struct TCGCPUOps riscv_tcg_ops = { .tlb_fill = riscv_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = riscv_cpu_has_work, .cpu_exec_interrupt = riscv_cpu_exec_interrupt, .do_interrupt = riscv_cpu_do_interrupt, .do_transaction_failed = riscv_cpu_do_transaction_failed,
@@ -666,7 +665,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_reset (dc, riscv_cpu_reset, &mcc->parent_reset); cc->class_by_name = riscv_cpu_class_by_name; - cc->has_work = riscv_cpu_has_work; cc->dump_state = riscv_cpu_dump_state; cc->set_pc = riscv_cpu_set_pc; cc->gdb_read_register = riscv_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 23/30] target/riscv: Restrict has_work() handler to sysemu and TCG
Quoted 6 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/riscv/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
r~
PATCH v3 24/30 target/rx: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/rx/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/rx/cpu.c +3 -1
@@ -41,11 +41,13 @@ static void rx_cpu_synchronize_from_tb(CPUState *cs, cpu->env.pc = tb->pc; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool rx_cpu_has_work (CPUState *cs) {return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_FIR ); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void rx_cpu_reset (DeviceState *dev) {
@@ -189,6 +191,7 @@ static const struct TCGCPUOps rx_tcg_ops = { .tlb_fill = rx_cpu_tlb_fill,#ifndef CONFIG_USER_ONLY + .has_work = rx_cpu_has_work, .cpu_exec_interrupt = rx_cpu_exec_interrupt, .do_interrupt = rx_cpu_do_interrupt,#endif /* !CONFIG_USER_ONLY */
@@ -206,7 +209,6 @@ static void rx_cpu_class_init(ObjectClass *klass, void *data) &rcc->parent_reset); cc->class_by_name = rx_cpu_class_by_name; - cc->has_work = rx_cpu_has_work; cc->dump_state = rx_cpu_dump_state; cc->set_pc = rx_cpu_set_pc;
Signature · 1 line
2.31.1
Re: [PATCH v3 24/30] target/rx: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/rx/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)target/rx/cpu.c +0
-0
target/rx/cpu.c static void rx_cpu_synchronize_from_tb(CPUState *cs, · line 45
Quoted 5 lines
target/rx/cpu.c +1
-0@@ -41,11 +41,13 @@ static void rx_cpu_synchronize_from_tb(CPUState *cs, cpu->env.pc = tb->pc; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool rx_cpu_has_work (CPUState *cs)
No CONFIG_TCG, otherwise,
r~
PATCH v3 25/30 target/s390x: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/s390x/cpu.c +3 -1
@@ -88,6 +88,7 @@ static void s390_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.psw.addr = value; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool s390_cpu_has_work (CPUState *cs) {S390CPU *cpu =S390_CPU (cs);
@@ -104,6 +105,7 @@ static bool s390_cpu_has_work(CPUState *cs) return s390_cpu_has_int(cpu); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ /* S390CPUClass::reset() */ static void s390_cpu_reset (CPUState *s,cpu_reset_type type)
@@ -269,6 +271,7 @@ static const struct TCGCPUOps s390_tcg_ops = { .tlb_fill = s390_cpu_tlb_fill,#if !defined(CONFIG_USER_ONLY ) + .has_work = s390_cpu_has_work, .cpu_exec_interrupt = s390_cpu_exec_interrupt, .do_interrupt = s390_cpu_do_interrupt, .debug_excp_handler = s390x_cpu_debug_excp_handler,
@@ -292,7 +295,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) scc->reset = s390_cpu_reset; cc->class_by_name = s390_cpu_class_by_name, - cc->has_work = s390_cpu_has_work; cc->dump_state = s390_cpu_dump_state; cc->set_pc = s390_cpu_set_pc; cc->gdb_read_register = s390_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 25/30] target/s390x: Restrict has_work() handler to sysemu and TCG
Quoted 6 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
r~
PATCH v3 26/30 target/sh4: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/sh4/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
target/sh4/cpu.c +5 -2
@@ -58,12 +58,15 @@ static bool superh_io_recompile_replay_branch(CPUState *cs, }return false; } -#endif +#if defined(CONFIG_TCG )static bool superh_cpu_has_work (CPUState *cs) {return cs->interrupt_request &CPU_INTERRUPT_HARD ; } +#endif /* CONFIG_TCG */ + +#endif /* !CONFIG_USER_ONLY */ static void superh_cpu_reset (DeviceState *dev) {
@@ -239,6 +242,7 @@ static const struct TCGCPUOps superh_tcg_ops = { .tlb_fill = superh_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = superh_cpu_has_work, .cpu_exec_interrupt = superh_cpu_exec_interrupt, .do_interrupt = superh_cpu_do_interrupt, .do_unaligned_access = superh_cpu_do_unaligned_access,
@@ -258,7 +262,6 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_reset (dc, superh_cpu_reset, &scc->parent_reset); cc->class_by_name = superh_cpu_class_by_name; - cc->has_work = superh_cpu_has_work; cc->dump_state = superh_cpu_dump_state; cc->set_pc = superh_cpu_set_pc; cc->gdb_read_register = superh_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 26/30] target/sh4: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/sh4/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)target/sh4/cpu.c +0
-0
target/sh4/cpu.c static bool superh_io_recompile_replay_branch(CPUState *cs, · line 63
Quoted 7 lines
target/sh4/cpu.c +1
-1@@ -58,12 +58,15 @@ static bool superh_io_recompile_replay_branch(CPUState *cs, }return false; } -#endif +#if defined(CONFIG_TCG )static bool superh_cpu_has_work (CPUState *cs)
No CONFIG_TCG, otherwise,
r~
PATCH v3 27/30 target/sparc: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/sparc/cpu.c +3 -1
@@ -702,6 +702,7 @@ static void sparc_cpu_synchronize_from_tb(CPUState *cs, cpu->env.npc = tb->cs_base; } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool sparc_cpu_has_work (CPUState *cs) {SPARCCPU *cpu =SPARC_CPU (cs);
@@ -710,6 +711,7 @@ static bool sparc_cpu_has_work(CPUState *cs)return (cs->interrupt_request &CPU_INTERRUPT_HARD ) && cpu_interrupts_enabled(env); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static char *sparc_cpu_type_name (const char *cpu_model) {
@@ -868,6 +870,7 @@ static const struct TCGCPUOps sparc_tcg_ops = { .tlb_fill = sparc_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = sparc_cpu_has_work, .cpu_exec_interrupt = sparc_cpu_exec_interrupt, .do_interrupt = sparc_cpu_do_interrupt, .do_transaction_failed = sparc_cpu_do_transaction_failed,
@@ -890,7 +893,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) cc->class_by_name = sparc_cpu_class_by_name; cc->parse_features = sparc_cpu_parse_features; - cc->has_work = sparc_cpu_has_work; cc->dump_state = sparc_cpu_dump_state;#if !defined(TARGET_SPARC64 ) && !defined(CONFIG_USER_ONLY ) cc->memory_rw_debug = sparc_cpu_memory_rw_debug;
Signature · 1 line
2.31.1
Re: [PATCH v3 27/30] target/sparc: Restrict has_work() handler to sysemu and TCG
Quoted 6 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Though I think the one existing reference to CONFIG_TCG for this target is a mistake,
r~
PATCH v3 28/30 target/tricore: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/tricore/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
target/tricore/cpu.c +5 -1
@@ -62,10 +62,12 @@ static void tricore_cpu_reset(DeviceState *dev)cpu_state_reset (env); } +#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY )static bool tricore_cpu_has_work (CPUState *cs) {return true; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void tricore_cpu_realizefn (DeviceState *dev,Error **errp) {
@@ -154,6 +156,9 @@ static const struct TCGCPUOps tricore_tcg_ops = { .initialize = tricore_tcg_init, .synchronize_from_tb = tricore_cpu_synchronize_from_tb, .tlb_fill = tricore_cpu_tlb_fill, +#if !defined(CONFIG_USER_ONLY ) + .has_work = tricore_cpu_has_work, +#endif };static void tricore_cpu_class_init (ObjectClass *c,void *data)
@@ -167,7 +172,6 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_reset (dc, tricore_cpu_reset, &mcc->parent_reset); cc->class_by_name = tricore_cpu_class_by_name; - cc->has_work = tricore_cpu_has_work; cc->gdb_read_register = tricore_cpu_gdb_read_register; cc->gdb_write_register = tricore_cpu_gdb_write_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 28/30] target/tricore: Restrict has_work() handler to sysemu and TCG
Quoted 6 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/tricore/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
No CONFIG_TCG, otherwise,
r~
PATCH v3 29/30 target/xtensa: Restrict has_work() handler to sysemu and TCG
In reply to Philippe Mathieu-DaudéRestrict has_work() to TCG sysemu.
--- target/xtensa/cpu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
target/xtensa/cpu.c +9 -7
@@ -43,18 +43,19 @@ static void xtensa_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#ifndef CONFIG_USER_ONLY + +#if defined(CONFIG_TCG )static bool xtensa_cpu_has_work (CPUState *cs) { -#ifndef CONFIG_USER_ONLY XtensaCPU *cpu =XTENSA_CPU (cs);return !cpu->env.runstall && cpu->env.pending_irq_level; -#else -return true; -#endif } +#endif /* CONFIG_TCG */ + +#else /* CONFIG_USER_ONLY*/ -#ifdef CONFIG_USER_ONLY static bool abi_call0;void xtensa_set_abi_call0 (void )
@@ -66,7 +67,8 @@ bool xtensa_abi_call0(void) {return abi_call0; } -#endif + +#endif /* CONFIG_USER_ONLY */ static void xtensa_cpu_reset (DeviceState *dev) {
@@ -196,6 +198,7 @@ static const struct TCGCPUOps xtensa_tcg_ops = { .debug_excp_handler = xtensa_breakpoint_handler, #ifndef CONFIG_USER_ONLY + .has_work = xtensa_cpu_has_work, .cpu_exec_interrupt = xtensa_cpu_exec_interrupt, .do_interrupt = xtensa_cpu_do_interrupt, .do_transaction_failed = xtensa_cpu_do_transaction_failed,
@@ -215,7 +218,6 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_reset (dc, xtensa_cpu_reset, &xcc->parent_reset); cc->class_by_name = xtensa_cpu_class_by_name; - cc->has_work = xtensa_cpu_has_work; cc->dump_state = xtensa_cpu_dump_state; cc->set_pc = xtensa_cpu_set_pc; cc->gdb_read_register = xtensa_cpu_gdb_read_register;
Signature · 1 line
2.31.1
Re: [PATCH v3 29/30] target/xtensa: Restrict has_work() handler to sysemu and TCG
Quoted 12 lines · Philippe Mathieu-Daudé
Restrict
has_work()to TCG sysemu.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/xtensa/cpu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)target/xtensa/cpu.c +0
-0
target/xtensa/cpu.c static void xtensa_cpu_set_pc(CPUState *cs, vaddr value) · line 49
Quoted 7 lines
target/xtensa/cpu.c +3
-0@@ -43,18 +43,19 @@ static void xtensa_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +#ifndef CONFIG_USER_ONLY + +#if defined(CONFIG_TCG )static bool xtensa_cpu_has_work (CPUState *cs)
No CONFIG_TCG, otherwise,
r~
PATCH v3 30/30 accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one
In reply to Philippe Mathieu-Daudécpu_common_has_work() is the default has_work() implementation and returns 'false'.
Explicit it for the QTest / HAX / HVF / NVMM / Xen accelerators and remove cpu_common_has_work().
Since there are no more implementations of SysemuCPUOps::has_work, remove it along with the assertion in cpu_has_work().
--- include/hw/core/cpu.h | 2 -- accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/qtest/qtest.c | 6 ++++++ accel/xen/xen-all.c | 6 ++++++ hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 9 ++------- target/i386/hax/hax-accel-ops.c | 6 ++++++ target/i386/nvmm/nvmm-accel-ops.c | 6 ++++++ 8 files changed, 32 insertions(+), 15 deletions(-)
include/hw/core/cpu.h +0 -2
@@ -89,7 +89,6 @@ struct SysemuCPUOps;* instantiatable CPU type. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. -* @has_work: Callback for checking if there is work to do. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. * @get_arch_id: Callback for getting architecture-dependent CPU ID.
@@ -132,7 +131,6 @@ struct CPUClass {void (*parse_features)(const char *typename,char *str,Error **errp);int reset_dump_flags; -bool (*has_work)(CPUState *cpu);int (*memory_rw_debug)(CPUState *cpu,vaddr addr,uint8_t *buf,int len,bool is_write);void (*dump_state)(CPUState *cpu,FILE *,int flags);
accel/hvf/hvf-accel-ops.c +6 -0
@@ -446,6 +446,11 @@ static void hvf_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } +static bool hvf_cpu_has_work (CPUState *cpu) +{ +return false; +} +static void hvf_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc);
@@ -456,6 +461,7 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = hvf_cpu_synchronize_post_init; ops->synchronize_state = hvf_cpu_synchronize_state; ops->synchronize_pre_loadvm = hvf_cpu_synchronize_pre_loadvm; + ops->has_work = hvf_cpu_has_work; };static const TypeInfo hvf_accel_ops_type = { .name =ACCEL_OPS_NAME ("hvf" ),
accel/qtest/qtest.c +6 -0
@@ -47,12 +47,18 @@ static const TypeInfo qtest_accel_type = { };module_obj (TYPE_QTEST_ACCEL ); +static bool qtest_cpu_has_work (CPUState *cpu) +{ +return false; +} +static void qtest_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); ops->create_vcpu_thread = dummy_start_vcpu_thread; ops->get_virtual_clock = qtest_get_virtual_clock; + ops->has_work = qtest_cpu_has_work; };static const TypeInfo qtest_accel_ops_type = {
accel/xen/xen-all.c +6 -0
@@ -215,11 +215,17 @@ static const TypeInfo xen_accel_type = { .class_init = xen_accel_class_init, }; +static bool xen_cpu_has_work (CPUState *cpu) +{ +return false; +} +static void xen_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); ops->create_vcpu_thread = dummy_start_vcpu_thread; + ops->has_work = xen_cpu_has_work; }static const TypeInfo xen_accel_ops_type = {
hw/core/cpu-common.c +0 -6
@@ -143,11 +143,6 @@ static void cpu_common_reset(DeviceState *dev) } } -static bool cpu_common_has_work (CPUState *cs) -{ -return false; -} -ObjectClass *cpu_class_by_name (const char *typename,const char *cpu_model) {CPUClass *cc =CPU_CLASS (object_class_by_name (typename));
@@ -279,7 +274,6 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->parse_features = cpu_common_parse_features; k->get_arch_id = cpu_common_get_arch_id; - k->has_work = cpu_common_has_work; k->gdb_read_register = cpu_common_gdb_read_register; k->gdb_write_register = cpu_common_gdb_write_register;set_bit (DEVICE_CATEGORY_CPU , dc->categories);
softmmu/cpus.c +2 -7
@@ -251,13 +251,8 @@ void cpu_interrupt(CPUState *cpu, int mask)bool cpu_has_work (CPUState *cpu) { -CPUClass *cc =CPU_GET_CLASS (cpu); - -if (cpus_accel->has_work) { -return cpus_accel->has_work (cpu); - } -g_assert (cc->has_work); -return cc->has_work (cpu); +g_assert (cpus_accel->has_work); +return cpus_accel->has_work (cpu); }static int do_vm_stop (RunState state,bool send_stop)
target/i386/hax/hax-accel-ops.c +6 -0
@@ -74,6 +74,11 @@ static void hax_start_vcpu_thread(CPUState *cpu)#endif } +static bool hax_cpu_has_work (CPUState *cpu) +{ +return false; +} +static void hax_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc);
@@ -85,6 +90,7 @@ static void hax_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = hax_cpu_synchronize_post_init; ops->synchronize_state = hax_cpu_synchronize_state; ops->synchronize_pre_loadvm = hax_cpu_synchronize_pre_loadvm; + ops->has_work = hax_cpu_has_work; }static const TypeInfo hax_accel_ops_type = {
target/i386/nvmm/nvmm-accel-ops.c +6 -0
@@ -83,6 +83,11 @@ static void nvmm_kick_vcpu_thread(CPUState *cpu)cpus_kick_thread (cpu); } +static bool nvmm_cpu_has_work (CPUState *cpu) +{ +return false; +} +static void nvmm_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc);
@@ -94,6 +99,7 @@ static void nvmm_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = nvmm_cpu_synchronize_post_init; ops->synchronize_state = nvmm_cpu_synchronize_state; ops->synchronize_pre_loadvm = nvmm_cpu_synchronize_pre_loadvm; + ops->has_work = nvmm_cpu_has_work; }static const TypeInfo nvmm_accel_ops_type = {
Signature · 1 line
2.31.1
Re: [PATCH v3 30/30] accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one
Quoted 10 lines · Philippe Mathieu-Daudé
cpu_common_has_work()is the defaulthas_work()implementation and returns 'false'.Explicit it for the QTest / HAX / HVF / NVMM / Xen accelerators and remove
cpu_common_has_work().Since there are no more implementations of
SysemuCPUOps::has_work, remove it along with the assertion incpu_has_work().Signed-off-by Philippe Mathieu-Daudé<[email protected]>
Quoted 10 lines
--- include/hw/core/cpu.h | 2 -- accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/qtest/qtest.c | 6 ++++++ accel/xen/xen-all.c | 6 ++++++ hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 9 ++------- target/i386/hax/hax-accel-ops.c | 6 ++++++ target/i386/nvmm/nvmm-accel-ops.c | 6 ++++++ 8 files changed, 32 insertions(+), 15 deletions(-)
r~
Re: [PATCH v3 30/30] accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one
In reply to Philippe Mathieu-DaudéQuoted 10 lines · Philippe Mathieu-Daudé
cpu_common_has_work()is the defaulthas_work()implementation and returns 'false'.Explicit it for the QTest / HAX / HVF / NVMM / Xen accelerators and remove
cpu_common_has_work().Since there are no more implementations of
SysemuCPUOps::has_work, remove it along with the assertion incpu_has_work().Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Xen parts...