|
 |
619821 |
From 905a9704d3099a82421850ae172b89f4de2e58b3 Mon Sep 17 00:00:00 2001
|
|
|
619821 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Date: Thu, 23 Feb 2017 14:29:37 +0100
|
|
|
619821 |
Subject: [PATCH 07/17] target-i386: kvm_cpu_fill_host(): Set all feature words
|
|
|
619821 |
at end of function
|
|
|
619821 |
|
|
|
619821 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Message-id: <20170223142945.17790-7-ehabkost@redhat.com>
|
|
|
619821 |
Patchwork-id: 74037
|
|
|
619821 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 06/14] target-i386: kvm_cpu_fill_host(): Set all feature words at end of function
|
|
|
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 |
Reorder the code so all the code that sets x86_cpu_def->features is at
|
|
|
619821 |
the end of the function.
|
|
|
619821 |
|
|
|
619821 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
619821 |
(cherry picked from commit 2a573259ebf8b1072707257d547603520d1ed236)
|
|
|
619821 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
619821 |
---
|
|
|
619821 |
target-i386/cpu.c | 29 ++++++++++++-----------------
|
|
|
619821 |
1 file changed, 12 insertions(+), 17 deletions(-)
|
|
|
619821 |
|
|
|
619821 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
619821 |
index 02bd038..1515b87 100644
|
|
|
619821 |
--- a/target-i386/cpu.c
|
|
|
619821 |
+++ b/target-i386/cpu.c
|
|
|
619821 |
@@ -1262,35 +1262,30 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
|
|
|
619821 |
x86_cpu_def->stepping = eax & 0x0F;
|
|
|
619821 |
|
|
|
619821 |
x86_cpu_def->level = kvm_arch_get_supported_cpuid(s, 0x0, 0, R_EAX);
|
|
|
619821 |
+ x86_cpu_def->xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX);
|
|
|
619821 |
+ x86_cpu_def->xlevel2 =
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX);
|
|
|
619821 |
+
|
|
|
619821 |
+ cpu_x86_fill_model_id(x86_cpu_def->model_id);
|
|
|
619821 |
+
|
|
|
619821 |
x86_cpu_def->features[FEAT_1_EDX] =
|
|
|
619821 |
kvm_arch_get_supported_cpuid(s, 0x1, 0, R_EDX);
|
|
|
619821 |
x86_cpu_def->features[FEAT_1_ECX] =
|
|
|
619821 |
kvm_arch_get_supported_cpuid(s, 0x1, 0, R_ECX);
|
|
|
619821 |
-
|
|
|
619821 |
x86_cpu_def->features[FEAT_7_0_EBX] =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0x7, 0, R_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 |
+ 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 |
+ 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 |
- x86_cpu_def->xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX);
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0xd, 1, R_EAX);
|
|
|
619821 |
x86_cpu_def->features[FEAT_8000_0001_EDX] =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_EDX);
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_EDX);
|
|
|
619821 |
x86_cpu_def->features[FEAT_8000_0001_ECX] =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_ECX);
|
|
|
619821 |
-
|
|
|
619821 |
- cpu_x86_fill_model_id(x86_cpu_def->model_id);
|
|
|
619821 |
-
|
|
|
619821 |
- /* Call Centaur's CPUID instruction. */
|
|
|
619821 |
- x86_cpu_def->xlevel2 =
|
|
|
619821 |
- kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX);
|
|
|
619821 |
+ kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_ECX);
|
|
|
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 |
kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX);
|
|
|
619821 |
x86_cpu_def->features[FEAT_KVM] =
|
|
|
619821 |
--
|
|
|
619821 |
1.8.3.1
|
|
|
619821 |
|