|
 |
619821 |
From f51c618ce3598d9a6a3256e4dd2b9dd3164fbc81 Mon Sep 17 00:00:00 2001
|
|
|
619821 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Date: Thu, 23 Feb 2017 14:29:36 +0100
|
|
|
619821 |
Subject: [PATCH 06/17] target-i386: kvm_cpu_fill_host(): No need to check
|
|
|
619821 |
xlevel2
|
|
|
619821 |
|
|
|
619821 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Message-id: <20170223142945.17790-6-ehabkost@redhat.com>
|
|
|
619821 |
Patchwork-id: 74036
|
|
|
619821 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 05/14] target-i386: kvm_cpu_fill_host(): No need to check xlevel2
|
|
|
619821 |
Bugzilla: 1382122
|
|
|
619821 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
619821 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
619821 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
619821 |
|
|
|
619821 |
There's no need to check CPU xlevel2 before calling
|
|
|
619821 |
kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX), because:
|
|
|
619821 |
|
|
|
619821 |
* The kernel won't return any entry for 0xC0000000 if host CPU vendor
|
|
|
619821 |
is not Centaur (See kvm_dev_ioctl_get_supported_cpuid() on the kernel
|
|
|
619821 |
code)
|
|
|
619821 |
* Similarly, the kernel won't return any entry for 0xC0000001 if
|
|
|
619821 |
CPUID[0xC0000000].EAX is < 0xC0000001
|
|
|
619821 |
* kvm_arch_get_supported_cpuid() will return 0 if no entry is returned
|
|
|
619821 |
by the kernel for the requested leaf
|
|
|
619821 |
|
|
|
619821 |
For similar reasons, we can simply set x86_cpu_def->xlevel2 directly
|
|
|
619821 |
instead of making it conditional, because it will be set to 0 CPU vendor
|
|
|
619821 |
is not Centaur.
|
|
|
619821 |
|
|
|
619821 |
This will simplify the kvm_cpu_fill_host() code a little.
|
|
|
619821 |
|
|
|
619821 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
[Remove unparseable comment. - Paolo]
|
|
|
619821 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
619821 |
(cherry picked from commit 803a932706e3ba335d4c98f3577a05cb000f1699)
|
|
|
619821 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
|
|
|
619821 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
619821 |
---
|
|
|
619821 |
target-i386/cpu.c | 11 ++++-------
|
|
|
619821 |
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
619821 |
|
|
|
619821 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
619821 |
index a10055b..02bd038 100644
|
|
|
619821 |
--- a/target-i386/cpu.c
|
|
|
619821 |
+++ b/target-i386/cpu.c
|
|
|
619821 |
@@ -1285,13 +1285,10 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
|
|
|
619821 |
cpu_x86_fill_model_id(x86_cpu_def->model_id);
|
|
|
619821 |
|
|
|
619821 |
/* Call Centaur's CPUID instruction. */
|
|
|
619821 |
- eax = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX);
|
|
|
619821 |
- if (eax >= 0xC0000001) {
|
|
|
619821 |
- /* Support VIA max extended level */
|
|
|
619821 |
- x86_cpu_def->xlevel2 = eax;
|
|
|
619821 |
- x86_cpu_def->features[FEAT_C000_0001_EDX] =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX);
|
|
|
619821 |
- }
|
|
|
619821 |
+ x86_cpu_def->xlevel2 =
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX);
|
|
|
619821 |
+ x86_cpu_def->features[FEAT_C000_0001_EDX] =
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX);
|
|
|
619821 |
|
|
|
619821 |
/* Other KVM-specific feature fields: */
|
|
|
619821 |
x86_cpu_def->features[FEAT_SVM] =
|
|
|
619821 |
--
|
|
|
619821 |
1.8.3.1
|
|
|
619821 |
|