Skip to content

Commit

Permalink
accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG
Browse files Browse the repository at this point in the history
We don't need to expose these TCG-specific methods to the
whole code base. Register them as AccelClass handlers, they
will be called by the generic accel_cpu_[un]realize() methods.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Claudio Fontana <cfontana@suse.de>
Message-Id: <20231003123026.99229-8-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
philmd authored and rth7680 committed Oct 3, 2023
1 parent fa312f2 commit 23af78b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
3 changes: 3 additions & 0 deletions accel/tcg/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc);
void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,
uintptr_t host_pc);

bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
void tcg_exec_unrealizefn(CPUState *cpu);

/* Return the current PC from CPU, which may be cached in TB. */
static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
{
Expand Down
2 changes: 2 additions & 0 deletions accel/tcg/tcg-all.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ static void tcg_accel_class_init(ObjectClass *oc, void *data)
AccelClass *ac = ACCEL_CLASS(oc);
ac->name = "tcg";
ac->init_machine = tcg_init_machine;
ac->cpu_common_realize = tcg_exec_realizefn;
ac->cpu_common_unrealize = tcg_exec_unrealizefn;
ac->allowed = &tcg_allowed;
ac->gdbstub_supported_sstep_flags = tcg_gdbstub_supported_sstep_flags;

Expand Down
9 changes: 0 additions & 9 deletions cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)
return;
}

/* NB: errp parameter is unused currently */
if (tcg_enabled()) {
tcg_exec_realizefn(cpu, errp);
}

/* Wait until cpu initialization complete before exposing cpu. */
cpu_list_add(cpu);

Expand Down Expand Up @@ -187,13 +182,9 @@ void cpu_exec_unrealizefn(CPUState *cpu)
cpu_list_remove(cpu);
/*
* Now that the vCPU has been removed from the RCU list, we can call
* tcg_exec_unrealizefn and
* accel_cpu_common_unrealize, which may free fields using call_rcu.
*/
accel_cpu_common_unrealize(cpu);
if (tcg_enabled()) {
tcg_exec_unrealizefn(cpu);
}
}

/*
Expand Down
2 changes: 0 additions & 2 deletions include/exec/cpu-all.h
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,6 @@ void dump_exec_info(GString *buf);

/* accel/tcg/cpu-exec.c */
int cpu_exec(CPUState *cpu);
bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
void tcg_exec_unrealizefn(CPUState *cpu);

/**
* cpu_set_cpustate_pointers(cpu)
Expand Down

0 comments on commit 23af78b

Please sign in to comment.