target/i386: Rename tcg_cpu_FOO() to include 'x86'

The tcg_cpu_FOO() names are x86 specific, so rename
them as x86_tcg_cpu_FOO() (as other names in this file)
to ease navigating the code.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Message-ID: <20240111120221.35072-5-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-01-10 09:30:48 +01:00
parent 83f1ab12b1
commit e129593f6f

View file

@ -114,18 +114,18 @@ static const struct TCGCPUOps x86_tcg_ops = {
#endif /* !CONFIG_USER_ONLY */ #endif /* !CONFIG_USER_ONLY */
}; };
static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) static void x86_tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc)
{ {
/* for x86, all cpus use the same set of operations */ /* for x86, all cpus use the same set of operations */
cc->tcg_ops = &x86_tcg_ops; cc->tcg_ops = &x86_tcg_ops;
} }
static void tcg_cpu_class_init(CPUClass *cc) static void x86_tcg_cpu_class_init(CPUClass *cc)
{ {
cc->init_accel_cpu = tcg_cpu_init_ops; cc->init_accel_cpu = x86_tcg_cpu_init_ops;
} }
static void tcg_cpu_xsave_init(void) static void x86_tcg_cpu_xsave_init(void)
{ {
#define XO(bit, field) \ #define XO(bit, field) \
x86_ext_save_areas[bit].offset = offsetof(X86XSaveArea, field); x86_ext_save_areas[bit].offset = offsetof(X86XSaveArea, field);
@ -147,25 +147,25 @@ static void tcg_cpu_xsave_init(void)
* TCG-specific defaults that override cpudef models when using TCG. * TCG-specific defaults that override cpudef models when using TCG.
* Only for builtin_x86_defs models initialized with x86_register_cpudef_types. * Only for builtin_x86_defs models initialized with x86_register_cpudef_types.
*/ */
static PropValue tcg_default_props[] = { static PropValue x86_tcg_default_props[] = {
{ "vme", "off" }, { "vme", "off" },
{ NULL, NULL }, { NULL, NULL },
}; };
static void tcg_cpu_instance_init(CPUState *cs) static void x86_tcg_cpu_instance_init(CPUState *cs)
{ {
X86CPU *cpu = X86_CPU(cs); X86CPU *cpu = X86_CPU(cs);
X86CPUClass *xcc = X86_CPU_GET_CLASS(cpu); X86CPUClass *xcc = X86_CPU_GET_CLASS(cpu);
if (xcc->model) { if (xcc->model) {
/* Special cases not set in the X86CPUDefinition structs: */ /* Special cases not set in the X86CPUDefinition structs: */
x86_cpu_apply_props(cpu, tcg_default_props); x86_cpu_apply_props(cpu, x86_tcg_default_props);
} }
tcg_cpu_xsave_init(); x86_tcg_cpu_xsave_init();
} }
static void tcg_cpu_accel_class_init(ObjectClass *oc, void *data) static void x86_tcg_cpu_accel_class_init(ObjectClass *oc, void *data)
{ {
AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); AccelCPUClass *acc = ACCEL_CPU_CLASS(oc);
@ -173,18 +173,18 @@ static void tcg_cpu_accel_class_init(ObjectClass *oc, void *data)
acc->cpu_target_realize = tcg_cpu_realizefn; acc->cpu_target_realize = tcg_cpu_realizefn;
#endif /* CONFIG_USER_ONLY */ #endif /* CONFIG_USER_ONLY */
acc->cpu_class_init = tcg_cpu_class_init; acc->cpu_class_init = x86_tcg_cpu_class_init;
acc->cpu_instance_init = tcg_cpu_instance_init; acc->cpu_instance_init = x86_tcg_cpu_instance_init;
} }
static const TypeInfo tcg_cpu_accel_type_info = { static const TypeInfo x86_tcg_cpu_accel_type_info = {
.name = ACCEL_CPU_NAME("tcg"), .name = ACCEL_CPU_NAME("tcg"),
.parent = TYPE_ACCEL_CPU, .parent = TYPE_ACCEL_CPU,
.class_init = tcg_cpu_accel_class_init, .class_init = x86_tcg_cpu_accel_class_init,
.abstract = true, .abstract = true,
}; };
static void tcg_cpu_accel_register_types(void) static void x86_tcg_cpu_accel_register_types(void)
{ {
type_register_static(&tcg_cpu_accel_type_info); type_register_static(&x86_tcg_cpu_accel_type_info);
} }
type_init(tcg_cpu_accel_register_types); type_init(x86_tcg_cpu_accel_register_types);