From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkfmm-0007S6-QF for qemu-devel@nongnu.org; Sun, 24 Nov 2013 14:56:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vkfmg-0003CZ-NS for qemu-devel@nongnu.org; Sun, 24 Nov 2013 14:56:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkfmg-0003CT-Df for qemu-devel@nongnu.org; Sun, 24 Nov 2013 14:55:58 -0500 From: Eduardo Habkost Date: Sun, 24 Nov 2013 17:55:38 -0200 Message-Id: <1385322940-27325-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1385322940-27325-1-git-send-email-ehabkost@redhat.com> References: <1385322940-27325-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] target-i386: kvm_cpu_fill_host(): Fill feature words in a loop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Now that the kvm_cpu_fill_host() code is simplified, we can simply set the feature word array using a simple loop. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 57bec6c..9fc8500 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1165,22 +1165,13 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) 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); - x86_cpu_def->features[FEAT_8000_0001_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); - x86_cpu_def->features[FEAT_C000_0001_EDX] = - kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX); - x86_cpu_def->features[FEAT_SVM] = - kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX); - x86_cpu_def->features[FEAT_KVM] = - kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX); + FeatureWord w; + for (w = 0; w < FEATURE_WORDS; w++) { + FeatureWordInfo *wi = &feature_word_info[w]; + x86_cpu_def->features[w] = + kvm_arch_get_supported_cpuid(s, wi->cpuid_eax, wi->cpuid_ecx, + wi->cpuid_reg); + } #endif /* CONFIG_KVM */ } -- 1.8.3.1