Skip to content

Commit

Permalink
target-i386: Simplify cpu_x86_find_by_name()
Browse files Browse the repository at this point in the history
Catch NULL name argument early to avoid repeated checks.
Similarly, check for -cpu host early and untangle from iterating through
model definitions. This prepares for introducing X86CPU subclasses.

Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
afaerber committed Jan 27, 2013
1 parent 8932cfd commit 4bfe910
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions target-i386/cpu.c
Expand Up @@ -1318,20 +1318,22 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name)
{
x86_def_t *def;

for (def = x86_defs; def; def = def->next) {
if (name && !strcmp(name, def->name)) {
break;
}
if (name == NULL) {
return -1;
}
if (kvm_enabled() && name && strcmp(name, "host") == 0) {
if (kvm_enabled() && strcmp(name, "host") == 0) {
kvm_cpu_fill_host(x86_cpu_def);
} else if (!def) {
return -1;
} else {
memcpy(x86_cpu_def, def, sizeof(*def));
return 0;
}

return 0;
for (def = x86_defs; def; def = def->next) {
if (strcmp(name, def->name) == 0) {
memcpy(x86_cpu_def, def, sizeof(*def));
return 0;
}
}

return -1;
}

/* Parse "+feature,-feature,feature=foo" CPU feature string
Expand Down

0 comments on commit 4bfe910

Please sign in to comment.