From: Philippe Mathieu-Daudé <philmd@linaro.org>
Currently accel_cpu_realize() only performs target-specific
realization. Introduce the [un]realize_cpu fields in the
base AccelClass to be able to perform target-agnostic
[un]realization of vCPUs.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230915190009.68404-4-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/accel.h | 2 ++
accel/accel-target.c | 21 +++++++++++++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/include/qemu/accel.h b/include/qemu/accel.h
index 7b02cb40e5..0b6031bd82 100644
--- a/include/qemu/accel.h
+++ b/include/qemu/accel.h
@@ -43,6 +43,8 @@ typedef struct AccelClass {
bool (*has_memory)(MachineState *ms, AddressSpace *as,
hwaddr start_addr, hwaddr size);
#endif
+ bool (*realize_cpu)(CPUState *cpu, Error **errp);
+ void (*unrealize_cpu)(CPUState *cpu);
/* gdbstub related hooks */
int (*gdbstub_supported_sstep_flags)(void);
diff --git a/accel/accel-target.c b/accel/accel-target.c
index cc3a45e663..6d427f2b9d 100644
--- a/accel/accel-target.c
+++ b/accel/accel-target.c
@@ -122,15 +122,32 @@ void accel_cpu_instance_init(CPUState *cpu)
bool accel_cpu_realize(CPUState *cpu, Error **errp)
{
CPUClass *cc = CPU_GET_CLASS(cpu);
+ AccelState *accel = current_accel();
+ AccelClass *acc = ACCEL_GET_CLASS(accel);
- if (cc->accel_cpu && cc->accel_cpu->cpu_realizefn) {
- return cc->accel_cpu->cpu_realizefn(cpu, errp);
+ /* target specific realization */
+ if (cc->accel_cpu && cc->accel_cpu->cpu_realizefn
+ && !cc->accel_cpu->cpu_realizefn(cpu, errp)) {
+ return false;
}
+
+ /* generic realization */
+ if (acc->realize_cpu && !acc->realize_cpu(cpu, errp)) {
+ return false;
+ }
+
return true;
}
void accel_cpu_unrealize(CPUState *cpu)
{
+ AccelState *accel = current_accel();
+ AccelClass *acc = ACCEL_GET_CLASS(accel);
+
+ /* generic unrealization */
+ if (acc->unrealize_cpu) {
+ acc->unrealize_cpu(cpu);
+ }
}
int accel_supported_gdbstub_sstep_flags(void)
--
2.34.1