[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] target-i386: kvm_cpu_fill_host(): No need to ch
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 3/8] target-i386: kvm_cpu_fill_host(): No need to check CPU vendor |
Date: |
Sun, 24 Nov 2013 17:55:35 -0200 |
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_supported_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 <address@hidden>
---
target-i386/cpu.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index f659a3b..41726f8 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1176,14 +1176,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: */
--
1.8.3.1
- [Qemu-devel] [PATCH 0/8] target-i386: Simplify kvm_cpu_fill_host() and kvm_check_features_against_host(), Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 1/8] target-i386: kvm_cpu_fill_host(): Kill unused code, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 2/8] target-i386: kvm_cpu_fill_host(): No need to check level, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 3/8] target-i386: kvm_cpu_fill_host(): No need to check CPU vendor,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 4/8] target-i386: kvm_cpu_fill_host(): No need to check xlevel2, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 5/8] target-i386: kvm_cpu_fill_host(): Set all feature words at end of function, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 6/8] target-i386: kvm_cpu_fill_host(): Fill feature words in a loop, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 7/8] target-i386: kvm_check_features_against_host(): Kill feature word array, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 8/8] target-i386: kvm_check_features_against_host(): Don't use kvm_cpu_fill_host(), Eduardo Habkost, 2013/11/24