|
 |
9ae3a8 |
From acedcdc24c0aad54530c0d41958b19981207e803 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 23 Feb 2017 14:29:38 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 08/17] target-i386: kvm_cpu_fill_host(): Fill feature words in
|
|
|
9ae3a8 |
a loop
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Message-id: <20170223142945.17790-8-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 74038
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 07/14] target-i386: kvm_cpu_fill_host(): Fill feature words in a loop
|
|
|
9ae3a8 |
Bugzilla: 1382122
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Now that the kvm_cpu_fill_host() code is simplified, we can simply set
|
|
|
9ae3a8 |
the feature word array using a simple loop.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 2bc65d2b020887da3eb9043ae4f7d133ed85a7fe)
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
target-i386/cpu.c | 29 +++++++----------------------
|
|
|
9ae3a8 |
1 file changed, 7 insertions(+), 22 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
9ae3a8 |
index 1515b87..22ad4f9 100644
|
|
|
9ae3a8 |
--- a/target-i386/cpu.c
|
|
|
9ae3a8 |
+++ b/target-i386/cpu.c
|
|
|
9ae3a8 |
@@ -1268,28 +1268,13 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
cpu_x86_fill_model_id(x86_cpu_def->model_id);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_1_EDX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x1, 0, R_EDX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_1_ECX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x1, 0, R_ECX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_7_0_EBX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_7_0_ECX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x7, 0, R_ECX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_7_0_EDX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EDX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_XSAVE] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0xd, 1, R_EAX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_8000_0001_EDX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_EDX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_8000_0001_ECX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_ECX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_C000_0001_EDX] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_SVM] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX);
|
|
|
9ae3a8 |
- x86_cpu_def->features[FEAT_KVM] =
|
|
|
9ae3a8 |
- kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX);
|
|
|
9ae3a8 |
+ FeatureWord w;
|
|
|
9ae3a8 |
+ for (w = 0; w < FEATURE_WORDS; w++) {
|
|
|
9ae3a8 |
+ FeatureWordInfo *wi = &feature_word_info[w];
|
|
|
9ae3a8 |
+ x86_cpu_def->features[w] =
|
|
|
9ae3a8 |
+ kvm_arch_get_supported_cpuid(s, wi->cpuid_eax, wi->cpuid_ecx,
|
|
|
9ae3a8 |
+ wi->cpuid_reg);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#endif /* CONFIG_KVM */
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|