motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

cpus: Replace CPU_RESOLVING_TYPE -> target_cpu_type()

Browse source 
Replace the target-specific CPU_RESOLVING_TYPE definition
by a call to the target-agnostic target_cpu_type() runtime
helper.

Since the big "cpu.h" is not required anymore in tcg-all.c,
remove it, using the tinier "cpu-param.h" header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20250417165430.58213-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-03-23 17:42:37 +01:00
parent 2b7ae6e0f6
commit 5e15bb7d66
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
accel/accel-target.c
View file

@ -25,6 +25,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/accel.h" #include "qemu/accel.h"
#include "qemu/target-info.h"
#include "cpu.h" #include "cpu.h"
#include "accel/accel-cpu-target.h" #include "accel/accel-cpu-target.h"
@ -88,17 +89,18 @@ static void accel_init_cpu_interfaces(AccelClass *ac)
const char *ac_name; /* AccelClass name */ const char *ac_name; /* AccelClass name */
char *acc_name; /* AccelCPUClass name */ char *acc_name; /* AccelCPUClass name */
ObjectClass *acc; /* AccelCPUClass */ ObjectClass *acc; /* AccelCPUClass */
const char *cpu_resolving_type = target_cpu_type();
ac_name = object_class_get_name(OBJECT_CLASS(ac)); ac_name = object_class_get_name(OBJECT_CLASS(ac));
g_assert(ac_name != NULL); g_assert(ac_name != NULL);
acc_name = g_strdup_printf("%s-%s", ac_name, CPU_RESOLVING_TYPE); acc_name = g_strdup_printf("%s-%s", ac_name, cpu_resolving_type);
acc = object_class_by_name(acc_name); acc = object_class_by_name(acc_name);
g_free(acc_name); g_free(acc_name);
if (acc) { if (acc) {
object_class_foreach(accel_init_cpu_int_aux, object_class_foreach(accel_init_cpu_int_aux,
CPU_RESOLVING_TYPE, false, acc); cpu_resolving_type, false, acc);
} }
} }

5
accel/tcg/tcg-all.c
View file

@ -35,6 +35,7 @@
#include "qapi/qapi-types-common.h" #include "qapi/qapi-types-common.h"
#include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-builtin-visit.h"
#include "qemu/units.h" #include "qemu/units.h"
#include "qemu/target-info.h"
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
#include "hw/qdev-core.h" #include "hw/qdev-core.h"
#else #else
@ -43,7 +44,7 @@
#endif #endif
#include "accel/tcg/cpu-ops.h" #include "accel/tcg/cpu-ops.h"
#include "internal-common.h" #include "internal-common.h"
#include "cpu.h" #include "cpu-param.h"
struct TCGState { struct TCGState {
@ -89,7 +90,7 @@ static int tcg_init_machine(MachineState *ms)
unsigned max_threads = 1; unsigned max_threads = 1;
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
CPUClass *cc = CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE)); CPUClass *cc = CPU_CLASS(object_class_by_name(target_cpu_type()));
bool mttcg_supported = cc->tcg_ops->mttcg_supported; bool mttcg_supported = cc->tcg_ops->mttcg_supported;
switch (s->mttcg_enabled) { switch (s->mttcg_enabled) {

7
cpu-target.c
View file

@ -22,6 +22,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/qemu-print.h" #include "qemu/qemu-print.h"
#include "qemu/target-info.h"
#include "system/accel-ops.h" #include "system/accel-ops.h"
#include "system/cpus.h" #include "system/cpus.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
@ -37,7 +38,7 @@ QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState));
char *cpu_model_from_type(const char *typename) char *cpu_model_from_type(const char *typename)
{ {
const char *suffix = "-" CPU_RESOLVING_TYPE; g_autofree char *suffix = g_strdup_printf("-%s", target_cpu_type());
if (!object_class_by_name(typename)) { if (!object_class_by_name(typename)) {
return NULL; return NULL;
@ -63,7 +64,7 @@ const char *parse_cpu_option(const char *cpu_option)
exit(1); exit(1);
} }
oc = cpu_class_by_name(CPU_RESOLVING_TYPE, model_pieces[0]); oc = cpu_class_by_name(target_cpu_type(), model_pieces[0]);
if (oc == NULL) { if (oc == NULL) {
error_report("unable to find CPU model '%s'", model_pieces[0]); error_report("unable to find CPU model '%s'", model_pieces[0]);
g_strfreev(model_pieces); g_strfreev(model_pieces);
@ -92,7 +93,7 @@ static void cpu_list_entry(gpointer data, gpointer user_data)
void list_cpus(void) void list_cpus(void)
{ {
CPUClass *cc = CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE)); CPUClass *cc = CPU_CLASS(object_class_by_name(target_cpu_type()));
if (cc->list_cpus) { if (cc->list_cpus) {
cc->list_cpus(); cc->list_cpus();