[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] target-i386: Don't change x86_def_t struct on c
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 2/7] target-i386: Don't change x86_def_t struct on cpu_x86_register() |
Date: |
Wed, 27 Nov 2013 17:34:04 -0200 |
As eventually the x86_def_t data is going to be provided by the CPU
class, it's better to not touch it, and handle the special cases on the
X86CPU object itself.
Current behavior of the code should stay exactly the same.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index b525592..bfe2453 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1822,11 +1822,6 @@ static void cpu_x86_register(X86CPU *cpu, const char
*name, Error **errp)
return;
}
- if (kvm_enabled()) {
- def->features[FEAT_KVM] |= kvm_default_features;
- }
- def->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR;
-
object_property_set_str(OBJECT(cpu), def->vendor, "vendor", errp);
object_property_set_int(OBJECT(cpu), def->level, "level", errp);
object_property_set_int(OBJECT(cpu), def->family, "family", errp);
@@ -1845,6 +1840,12 @@ static void cpu_x86_register(X86CPU *cpu, const char
*name, Error **errp)
cpu->cache_info_passthrough = def->cache_info_passthrough;
object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp);
+
+ /* Special cases not set in the x86_def_t structs: */
+ if (kvm_enabled()) {
+ env->features[FEAT_KVM] |= kvm_default_features;
+ }
+ env->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR;
}
X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
--
1.8.3.1
- [Qemu-devel] [PATCH 0/7] x86 CPU subclasses, take 6, Eduardo Habkost, 2013/11/27
- [Qemu-devel] [PATCH 1/7] target-i386: Eliminate CONFIG_KVM #ifdefs, Eduardo Habkost, 2013/11/27
- [Qemu-devel] [PATCH 2/7] target-i386: Don't change x86_def_t struct on cpu_x86_register(),
Eduardo Habkost <=
- [Qemu-devel] [PATCH 3/7] target-i386: Move KVM default-vendor hack to instance_init, Eduardo Habkost, 2013/11/27
- [Qemu-devel] [PATCH 4/7] target-i386: Rename cpu_x86_register() to x86_cpu_load_def(), Eduardo Habkost, 2013/11/27
- [Qemu-devel] [PATCH 5/7] target-i386: Call x86_cpu_load_def() earlier, Eduardo Habkost, 2013/11/27
- [Qemu-devel] [RFC 7/7] target-i386: CPU model subclasses, Eduardo Habkost, 2013/11/27
- [Qemu-devel] [PATCH 6/7] target-i386: Rename x86_def_t to X86CPUDefinition, Eduardo Habkost, 2013/11/27