|
 |
619821 |
From 40d8624f4a90769b60ee567035f8231b64c10011 Mon Sep 17 00:00:00 2001
|
|
|
619821 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Date: Thu, 23 Feb 2017 14:29:34 +0100
|
|
|
619821 |
Subject: [PATCH 04/17] target-i386: kvm_cpu_fill_host(): No need to check
|
|
|
619821 |
level
|
|
|
619821 |
|
|
|
619821 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Message-id: <20170223142945.17790-4-ehabkost@redhat.com>
|
|
|
619821 |
Patchwork-id: 74035
|
|
|
619821 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 03/14] target-i386: kvm_cpu_fill_host(): No need to check level
|
|
|
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 level (CPUID[0].EAX) before calling
|
|
|
619821 |
kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX), because:
|
|
|
619821 |
|
|
|
619821 |
* The kernel won't return any entry for CPUID 7 if CPUID[0].EAX is < 7
|
|
|
619821 |
on the host (See kvm_dev_ioctl_get_cpuid() on the kernel code);
|
|
|
619821 |
* kvm_arch_get_supported_cpuid() will return 0 if no entry is returned
|
|
|
619821 |
by the kernel for the requested leaf.
|
|
|
619821 |
|
|
|
619821 |
This will simplify the kvm_cpu_fill_host() code a little.
|
|
|
619821 |
|
|
|
619821 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
619821 |
(cherry picked from commit 7171a3933f2ee8cb984fd64c59ca081f39b943a4)
|
|
|
619821 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
619821 |
---
|
|
|
619821 |
target-i386/cpu.c | 18 ++++++------------
|
|
|
619821 |
1 file changed, 6 insertions(+), 12 deletions(-)
|
|
|
619821 |
|
|
|
619821 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
619821 |
index 8a49ff5..c82073e 100644
|
|
|
619821 |
--- a/target-i386/cpu.c
|
|
|
619821 |
+++ b/target-i386/cpu.c
|
|
|
619821 |
@@ -1267,18 +1267,12 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
|
|
|
619821 |
x86_cpu_def->features[FEAT_1_ECX] =
|
|
|
619821 |
kvm_arch_get_supported_cpuid(s, 0x1, 0, R_ECX);
|
|
|
619821 |
|
|
|
619821 |
- if (x86_cpu_def->level >= 7) {
|
|
|
619821 |
- x86_cpu_def->features[FEAT_7_0_EBX] =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX);
|
|
|
619821 |
- x86_cpu_def->features[FEAT_7_0_ECX] =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0x7, 0, R_ECX);
|
|
|
619821 |
- x86_cpu_def->features[FEAT_7_0_EDX] =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EDX);
|
|
|
619821 |
- } else {
|
|
|
619821 |
- x86_cpu_def->features[FEAT_7_0_EBX] = 0;
|
|
|
619821 |
- x86_cpu_def->features[FEAT_7_0_ECX] = 0;
|
|
|
619821 |
- x86_cpu_def->features[FEAT_7_0_EDX] = 0;
|
|
|
619821 |
- }
|
|
|
619821 |
+ x86_cpu_def->features[FEAT_7_0_EBX] =
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX);
|
|
|
619821 |
+ x86_cpu_def->features[FEAT_7_0_ECX] =
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0x7, 0, R_ECX);
|
|
|
619821 |
+ x86_cpu_def->features[FEAT_7_0_EDX] =
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EDX);
|
|
|
619821 |
x86_cpu_def->features[FEAT_XSAVE] =
|
|
|
619821 |
kvm_arch_get_supported_cpuid(s, 0xd, 1, R_EAX);
|
|
|
619821 |
|
|
|
619821 |
--
|
|
|
619821 |
1.8.3.1
|
|
|
619821 |
|