yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-19 10:18:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

qom: cpu: fix parsed feature string length

Browse Source 
since commit ( 9262685 cpu: Factor out cpu_generic_init() )
features parsed by it were truncated only to the 1st feature
after CPU name due to fact that

   featurestr = strtok(NULL, ",");
   cc->parse_features(cpu, featurestr, &err);

would extract exactly one feature and parse_features() callback
would parse it and only it leaving the rest of features ignored.

Reuse approach from x86 custom impl. i.e. replace strtok() token
parsing with g_strsplit(), which would split feature string in
2 parts name and features list and pass the later to
parse_features() callback.

Backports commit 3e2cf187eb3954fc406f81247a3fa598437ce1de from qemu
This commit is contained in:
Igor Mammedov 2018-03-20 13:04:01 -04:00 committed by Lioncash
parent 9c5153270f
commit cdc86cee50
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qemu/qom/cpu.c
View File

@ -43,28 +43,26 @@ bool cpu_exists(struct uc_struct *uc, int64_t id)
CPUState *cpu_generic_init(struct uc_struct *uc, const char *typename, const char *cpu_model)
{
char *str, *name, *featurestr;
CPUState *cpu = NULL;
ObjectClass *oc;
CPUClass *cc;
Error *err = NULL;
gchar **model_pieces;
str = g_strdup(cpu_model);
name = strtok(str, ",");
model_pieces = g_strsplit(cpu_model, ",", 2);
oc = cpu_class_by_name(uc, typename, name);
oc = cpu_class_by_name(uc, typename, model_pieces[0]);
if (oc == NULL) {
g_free(str);
g_strfreev(model_pieces);
return NULL;
}
cc = CPU_CLASS(uc, oc);
featurestr = strtok(NULL, ",");
/* TODO: all callers of cpu_generic_init() need to be converted to
* call parse_features() only once, before calling cpu_generic_init().
*/
cc->parse_features(uc, object_class_get_name(oc), featurestr, &err);
g_free(str);
cc->parse_features(uc, object_class_get_name(oc), model_pieces[1], &err);
g_strfreev(model_pieces);
if (err != NULL) {
goto out;
}