[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 3/6] target-i386: Simplify cpu_x86_find_by_name() logi
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 3/6] target-i386: Simplify cpu_x86_find_by_name() logic |
Date: |
Fri, 4 Jan 2013 17:56:19 -0200 |
Move the check for "host" to beginning of function, so instead of a
confusing if/else-if/else mess we now have just two obvious if/else
blocks:
1) Special case for "host";
2) General case for CPU model lookup on x86_defs list.
This way, we will be able to easily move those two parts to separate
class instance_init functions.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 6c75327..a2ac3c3 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1250,20 +1250,24 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t
*def, Error **errp)
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 (kvm_enabled() && name && strcmp(name, "host") == 0) {
#ifdef CONFIG_KVM
kvm_cpu_fill_host(x86_cpu_def);
#endif
- } else if (!def) {
- return -1;
} else {
+ x86_def_t *def;
+
+ for (def = x86_defs; def; def = def->next) {
+ if (name && !strcmp(name, def->name)) {
+ break;
+ }
+ }
+
+ if (!def) {
+ return -1;
+ }
+
memcpy(x86_cpu_def, def, sizeof(*def));
/* sysenter isn't supported on compatibility mode on AMD, syscall
* isn't supported in compatibility mode on Intel.
--
1.7.11.7
- [Qemu-devel] [RFC 0/6] x86 CPU subclasses, v4, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [RFC 1/6] target-i386: Move CPU object creation to cpu.c, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [RFC 5/6] target-i386: Move kvm_features/hypervisor initialization to cpu_x86_find_by_name(), Eduardo Habkost, 2013/01/04
- [Qemu-devel] [RFC 3/6] target-i386: Simplify cpu_x86_find_by_name() logic,
Eduardo Habkost <=
- [Qemu-devel] [RFC 4/6] target-i386: Set feature string parsing results directly on CPU object, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [RFC 2/6] target-i386: Make cpu_x86_create() get Error argument, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [RFC 6/6] target-i386: CPU model subclasses, Eduardo Habkost, 2013/01/04
- Re: [Qemu-devel] [RFC 0/6] x86 CPU subclasses, v4, Eduardo Habkost, 2013/01/04