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