[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 5/6] target-i386: Move kvm_features/hypervisor initial
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 5/6] target-i386: Move kvm_features/hypervisor initialization to cpu_x86_find_by_name() |
Date: |
Fri, 4 Jan 2013 17:56:21 -0200 |
Move the initialization to the cpu_x86_find_by_name(), inside the block
for predefined CPU models.
That code is not necessary for -cpu "host", because:
- kvm_features doesn't need to be set because kvm_cpu_fill_host()
already sets all bits supported by the host.
- the CPUID_EXT_HYPERVISOR flag doesn't need to be manually set because
kvm_arch_get_supported_cpuid() already sets it.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 54be18c..03b7f55 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1281,6 +1281,15 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def,
const char *name)
host_cpuid(0, 0, NULL, &ebx, &ecx, &edx);
x86cpu_vendor_words2str(x86_cpu_def->vendor, ebx, edx, ecx);
}
+
+ x86_cpu_def->kvm_features |= kvm_default_features;
+ add_flagname_to_bitmaps("hypervisor", &x86_cpu_def->features,
+ &x86_cpu_def->ext_features,
+ &x86_cpu_def->ext2_features,
+ &x86_cpu_def->ext3_features,
+ &x86_cpu_def->kvm_features,
+ &x86_cpu_def->svm_features,
+ &x86_cpu_def->cpuid_7_0_ebx_features);
}
return 0;
@@ -1555,12 +1564,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error
**errp)
env = &cpu->env;
env->cpu_model_str = cpu_model;
- def->kvm_features |= kvm_default_features;
- add_flagname_to_bitmaps("hypervisor", &def->features,
- &def->ext_features, &def->ext2_features,
- &def->ext3_features, &def->kvm_features,
- &def->svm_features, &def->cpuid_7_0_ebx_features);
-
cpudef_2_x86_cpu(cpu, def, &error);
if (cpu_x86_parse_featurestr(cpu, features, &props) < 0) {
--
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 <=
- [Qemu-devel] [RFC 3/6] target-i386: Simplify cpu_x86_find_by_name() logic, Eduardo Habkost, 2013/01/04
- [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