target-i386: Simplify cpu_x86_find_by_name()
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>
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index c5acaa7..37a4b03 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1318,20 +1318,22 @@
{
x86_def_t *def;
- for (def = x86_defs; def; def = def->next) {
- if (name && !strcmp(name, def->name)) {
- break;
- }
- }
- if (kvm_enabled() && name && strcmp(name, "host") == 0) {
- kvm_cpu_fill_host(x86_cpu_def);
- } else if (!def) {
+ if (name == NULL) {
return -1;
- } else {
- memcpy(x86_cpu_def, def, sizeof(*def));
+ }
+ if (kvm_enabled() && strcmp(name, "host") == 0) {
+ kvm_cpu_fill_host(x86_cpu_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
