yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 06:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

qom: cpus: split cpu_generic_init() on feature parsing and cpu creation parts

Browse source 
it would allow to reuse feature parsing part in various machines
that have CPU features instead of re-implementing the same feature
parsing each time.

Backports commit 3c72234c98004a01d79a24f78b07053cfebd0f22 from qemu
This commit is contained in:
Igor Mammedov 2018-03-20 13:08:07 -04:00 committed by Lioncash
parent cdc86cee50
commit 555eeb4120
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 50 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qemu/include/qom/cpu.h
View file

@ -527,6 +527,27 @@ void cpu_reset(CPUState *cpu);
*/ */
ObjectClass *cpu_class_by_name(struct uc_struct *uc, const char *typename, const char *cpu_model); ObjectClass *cpu_class_by_name(struct uc_struct *uc, const char *typename, const char *cpu_model);
/**
* cpu_create:
* @typename: The CPU type.
*
* Instantiates a CPU and realizes the CPU.
*
* Returns: A #CPUState or %NULL if an error occurred.
*/
CPUState *cpu_create(struct uc_struct *uc, const char *typename);
/**
* cpu_parse_cpu_model:
* @typename: The CPU base type or CPU type.
* @cpu_model: The model string including optional parameters.
*
* processes optional parameters and registers them as global properties
*
* Returns: type of CPU to create or %NULL if an error occurred.
*/
const char *cpu_parse_cpu_model(struct uc_struct *uc, const char *typename, const char *cpu_model);
/** /**
* cpu_generic_init: * cpu_generic_init:
* @typename: The CPU base type. * @typename: The CPU base type.

45
qemu/qom/cpu.c
View file

@ -41,13 +41,25 @@ bool cpu_exists(struct uc_struct *uc, int64_t id)
return !!cpu_by_arch_id(uc, id); return !!cpu_by_arch_id(uc, id);
} }
CPUState *cpu_generic_init(struct uc_struct *uc, const char *typename, const char *cpu_model) CPUState *cpu_create(struct uc_struct *uc, const char *typename)
{
Error *err = NULL;
CPUState *cpu = CPU(object_new(uc, typename));
object_property_set_bool(uc, OBJECT(cpu), true, "realized", &err);
if (err != NULL) {
object_unref(uc, OBJECT(cpu));
return NULL;
}
return cpu;
}
const char *cpu_parse_cpu_model(struct uc_struct *uc, const char *typename, const char *cpu_model)
{ {
CPUState *cpu = NULL;
ObjectClass *oc; ObjectClass *oc;
CPUClass *cc; CPUClass *cc;
Error *err = NULL; Error *err = NULL;
gchar **model_pieces; gchar **model_pieces;
const char *cpu_type;
model_pieces = g_strsplit(cpu_model, ",", 2); model_pieces = g_strsplit(cpu_model, ",", 2);
@ -57,27 +69,28 @@ CPUState *cpu_generic_init(struct uc_struct *uc, const char *typename, const cha
return NULL; return NULL;
} }
cpu_type = object_class_get_name(oc);
cc = CPU_CLASS(uc, oc); cc = CPU_CLASS(uc, oc);
/* TODO: all callers of cpu_generic_init() need to be converted to cc->parse_features(uc, cpu_type, model_pieces[1], &err);
* call parse_features() only once, before calling cpu_generic_init().
*/
cc->parse_features(uc, object_class_get_name(oc), model_pieces[1], &err);
g_strfreev(model_pieces); g_strfreev(model_pieces);
if (err != NULL) {
goto out;
}
cpu = CPU(object_new(uc, object_class_get_name(oc)));
object_property_set_bool(uc, OBJECT(cpu), true, "realized", &err);
out:
if (err != NULL) { if (err != NULL) {
error_free(err); error_free(err);
object_unref(uc, OBJECT(cpu));
return NULL; return NULL;
} }
return cpu_type;
}
return cpu; CPUState *cpu_generic_init(struct uc_struct *uc, const char *typename, const char *cpu_model)
{
/* TODO: all callers of cpu_generic_init() need to be converted to
* call cpu_parse_features() only once, before calling cpu_generic_init().
*/
const char *cpu_type = cpu_parse_cpu_model(uc, typename, cpu_model);
if (cpu_type) {
return cpu_create(uc, cpu_type);
}
return NULL;
} }
bool cpu_paging_enabled(const CPUState *cpu) bool cpu_paging_enabled(const CPUState *cpu)