diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-01-20 14:41:10 -0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-03 17:33:54 +0100 |
| commit | b73dcfb16fc894041de553ac9f98b9e1640fcf06 (patch) | |
| tree | fd1a52d1abdb96cdde23d9234c68eb75d7261f1d /target-i386 | |
| parent | 7171a3933f2ee8cb984fd64c59ca081f39b943a4 (diff) | |
| download | qemu-b73dcfb16fc894041de553ac9f98b9e1640fcf06.tar.gz qemu-b73dcfb16fc894041de553ac9f98b9e1640fcf06.tar.bz2 qemu-b73dcfb16fc894041de553ac9f98b9e1640fcf06.zip | |
target-i386: kvm_cpu_fill_host(): No need to check CPU vendor
There's no need to check CPU vendor before calling
kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX), because:
* The kernel won't return any entry for 0xC0000000 if host CPU vendor
is not Centaur (See kvm_dev_ioctl_get_cpuid() on the kernel code);
* kvm_arch_get_supported_cpuid() will return 0 if no entry is returned
by the kernel for the requested leaf.
This will simplify the kvm_cpu_fill_host() code a little.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 05138bd840..1e115cf039 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1177,14 +1177,12 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) cpu_x86_fill_model_id(x86_cpu_def->model_id); /* Call Centaur's CPUID instruction. */ - if (!strcmp(x86_cpu_def->vendor, CPUID_VENDOR_VIA)) { - eax = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX); - if (eax >= 0xC0000001) { - /* Support VIA max extended level */ - x86_cpu_def->xlevel2 = eax; - x86_cpu_def->features[FEAT_C000_0001_EDX] = - kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX); - } + eax = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX); + if (eax >= 0xC0000001) { + /* Support VIA max extended level */ + x86_cpu_def->xlevel2 = eax; + x86_cpu_def->features[FEAT_C000_0001_EDX] = + kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX); } /* Other KVM-specific feature fields: */ |