From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHI2-00018G-Sd for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:19:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHI0-00070v-1U for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:19:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHHz-00070M-P8 for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:19:11 -0500 From: Eduardo Habkost Date: Mon, 7 Jan 2013 16:20:47 -0200 Message-Id: <1357582848-16575-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1357582848-16575-1-git-send-email-ehabkost@redhat.com> References: <1357582848-16575-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH qom-cpu 6/7] target-i386/cpu.c: Add feature name array for ext4_features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: libvir-list@redhat.com, Igor Mammedov , Gleb Natapov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , kvm@vger.kernel.org Feature names were taken from the X86_FEATURE_* constants in the Linux kernel code. Signed-off-by: Eduardo Habkost --- Cc: Gleb Natapov --- target-i386/cpu.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 4b3ee63..a54c464 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -95,6 +95,17 @@ static const char *ext3_feature_name[] = { NULL, NULL, NULL, NULL, }; +static const char *ext4_feature_name[] = { + NULL, NULL, "xstore","xstore-en", + NULL, NULL, "xcrypt","xcrypt-en", + "ace2", "ace2-en", "phe", "phe-en", + "pmm", "pmm-en", NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, +}; + static const char *kvm_feature_name[] = { "kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvmclock", "kvm_asyncpf", "kvm_steal_time", "kvm_pv_eoi", NULL, @@ -147,6 +158,10 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .feat_names = ext3_feature_name, .cpuid_eax = 0x80000001, .cpuid_reg = R_ECX, }, + [FEAT_C000_0001_EDX] = { + .feat_names = ext4_feature_name, + .cpuid_eax = 0xC0000001, .cpuid_reg = R_EDX, + }, [FEAT_KVM] = { .feat_names = kvm_feature_name, .cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EAX, @@ -1412,6 +1427,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features) x86_cpu_def->ext_features |= plus_features[FEAT_1_ECX]; x86_cpu_def->ext2_features |= plus_features[FEAT_8000_0001_EDX]; x86_cpu_def->ext3_features |= plus_features[FEAT_8000_0001_ECX]; + x86_cpu_def->ext4_features |= plus_features[FEAT_C000_0001_EDX]; x86_cpu_def->kvm_features |= plus_features[FEAT_KVM]; x86_cpu_def->svm_features |= plus_features[FEAT_SVM]; x86_cpu_def->cpuid_7_0_ebx_features |= plus_features[FEAT_7_0_EBX]; @@ -1419,6 +1435,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features) x86_cpu_def->ext_features &= ~minus_features[FEAT_1_ECX]; x86_cpu_def->ext2_features &= ~minus_features[FEAT_8000_0001_EDX]; x86_cpu_def->ext3_features &= ~minus_features[FEAT_8000_0001_ECX]; + x86_cpu_def->ext4_features &= ~minus_features[FEAT_C000_0001_EDX]; x86_cpu_def->kvm_features &= ~minus_features[FEAT_KVM]; x86_cpu_def->svm_features &= ~minus_features[FEAT_SVM]; x86_cpu_def->cpuid_7_0_ebx_features &= ~minus_features[FEAT_7_0_EBX]; -- 1.7.11.7