[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v12 20/22] cpu: call AccelCPUClass::cpu_realizefn in cpu_exec_rea
From: |
Claudio Fontana |
Subject: |
[PATCH v12 20/22] cpu: call AccelCPUClass::cpu_realizefn in cpu_exec_realizefn |
Date: |
Tue, 12 Jan 2021 19:03:10 +0100 |
move the call to accel_cpu->cpu_realizefn to the general
cpu_exec_realizefn from target/i386, so it does not need to be
called for every target explicitly as we enable more targets.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
cpu.c | 6 ++++++
target/i386/cpu.c | 20 +++++++-------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cpu.c b/cpu.c
index bfbe5a66f9..ba5d272c1e 100644
--- a/cpu.c
+++ b/cpu.c
@@ -36,6 +36,7 @@
#include "sysemu/replay.h"
#include "exec/translate-all.h"
#include "exec/log.h"
+#include "hw/core/accel-cpu.h"
uintptr_t qemu_host_page_size;
intptr_t qemu_host_page_mask;
@@ -130,6 +131,11 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)
cpu_list_add(cpu);
+ if (cc->accel_cpu) {
+ /* NB: errp parameter is unused currently */
+ cc->accel_cpu->cpu_realizefn(cpu, errp);
+ }
+
#ifdef CONFIG_TCG
/* NB: errp parameter is unused currently */
if (tcg_enabled()) {
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 56a299ef14..9bfbf19a71 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6342,16 +6342,19 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu)
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
- CPUClass *cc = CPU_GET_CLASS(cs);
X86CPU *cpu = X86_CPU(dev);
X86CPUClass *xcc = X86_CPU_GET_CLASS(dev);
CPUX86State *env = &cpu->env;
Error *local_err = NULL;
static bool ht_warned;
- /* The accelerator realizefn needs to be called first. */
- if (cc->accel_cpu) {
- cc->accel_cpu->cpu_realizefn(cs, errp);
+ /* Process Hyper-V enlightenments */
+ x86_cpu_hyperv_realize(cpu);
+
+ cpu_exec_realizefn(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
}
if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) {
@@ -6467,15 +6470,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
env->cache_info_amd.l3_cache = &legacy_l3_cache;
}
- /* Process Hyper-V enlightenments */
- x86_cpu_hyperv_realize(cpu);
-
- cpu_exec_realizefn(cs, &local_err);
- if (local_err != NULL) {
- error_propagate(errp, local_err);
- return;
- }
-
#ifndef CONFIG_USER_ONLY
MachineState *ms = MACHINE(qdev_get_machine());
qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
--
2.26.2
- [PATCH v12 09/22] cpu: move cc->do_interrupt to tcg_ops, (continued)
- [PATCH v12 09/22] cpu: move cc->do_interrupt to tcg_ops, Claudio Fontana, 2021/01/12
- [PATCH v12 07/22] cpu: Move debug_excp_handler to tcg_ops, Claudio Fontana, 2021/01/12
- [PATCH v12 11/22] cpu: move do_unaligned_access to tcg_ops, Claudio Fontana, 2021/01/12
- [PATCH v12 10/22] cpu: move cc->transaction_failed to tcg_ops, Claudio Fontana, 2021/01/12
- [PATCH v12 13/22] cpu: move adjust_watchpoint_address to tcg_ops, Claudio Fontana, 2021/01/12
- [PATCH v12 12/22] physmem: make watchpoint checking code TCG-only, Claudio Fontana, 2021/01/12
- [PATCH v12 16/22] accel: extend AccelState and AccelClass to user-mode, Claudio Fontana, 2021/01/12
- [PATCH v12 14/22] cpu: move debug_check_watchpoint to tcg_ops, Claudio Fontana, 2021/01/12
- [PATCH v12 18/22] accel: introduce AccelCPUClass extending CPUClass, Claudio Fontana, 2021/01/12
- [PATCH v12 17/22] accel: replace struct CpusAccel with AccelOpsClass, Claudio Fontana, 2021/01/12
- [PATCH v12 20/22] cpu: call AccelCPUClass::cpu_realizefn in cpu_exec_realizefn,
Claudio Fontana <=
- [PATCH v12 15/22] cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass, Claudio Fontana, 2021/01/12
- [PATCH v12 19/22] i386: split cpu accelerators from cpu.c, using AccelCPUClass, Claudio Fontana, 2021/01/12
- [PATCH v12 22/22] accel: introduce new accessor functions, Claudio Fontana, 2021/01/12
- [PATCH v12 21/22] hw/core/cpu: call qemu_init_vcpu in cpu_common_realizefn, Claudio Fontana, 2021/01/12