From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv2oR-0002a3-D7 for qemu-devel@nongnu.org; Tue, 15 Jan 2013 04:28:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv2oP-0000eq-6T for qemu-devel@nongnu.org; Tue, 15 Jan 2013 04:28:07 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41042 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv2oO-0000eV-Sz for qemu-devel@nongnu.org; Tue, 15 Jan 2013 04:28:05 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 15 Jan 2013 10:27:30 +0100 Message-Id: <1358242058-1404-13-git-send-email-afaerber@suse.de> In-Reply-To: <1358242058-1404-1-git-send-email-afaerber@suse.de> References: <1358242058-1404-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 12/20] 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: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Feature names were taken from the X86_FEATURE_* constants in the Linux kernel code. Signed-off-by: Eduardo Habkost Reviewed-by: Gleb Natapov Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 17 +++++++++++++++++ 1 Datei ge=C3=A4ndert, 17 Zeilen hinzugef=C3=BCgt(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0e531f9..8ec9929 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -95,6 +95,17 @@ static const char *ext3_feature_name[] =3D { NULL, NULL, NULL, NULL, }; =20 +static const char *ext4_feature_name[] =3D { + 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[] =3D { "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_WOR= DS] =3D { .feat_names =3D ext3_feature_name, .cpuid_eax =3D 0x80000001, .cpuid_reg =3D R_ECX, }, + [FEAT_C000_0001_EDX] =3D { + .feat_names =3D ext4_feature_name, + .cpuid_eax =3D 0xC0000001, .cpuid_reg =3D R_EDX, + }, [FEAT_KVM] =3D { .feat_names =3D kvm_feature_name, .cpuid_eax =3D KVM_CPUID_FEATURES, .cpuid_reg =3D R_EAX, @@ -1439,6 +1454,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_= cpu_def, char *features) x86_cpu_def->ext_features |=3D plus_features[FEAT_1_ECX]; x86_cpu_def->ext2_features |=3D plus_features[FEAT_8000_0001_EDX]; x86_cpu_def->ext3_features |=3D plus_features[FEAT_8000_0001_ECX]; + x86_cpu_def->ext4_features |=3D plus_features[FEAT_C000_0001_EDX]; x86_cpu_def->kvm_features |=3D plus_features[FEAT_KVM]; x86_cpu_def->svm_features |=3D plus_features[FEAT_SVM]; x86_cpu_def->cpuid_7_0_ebx_features |=3D plus_features[FEAT_7_0_EBX]= ; @@ -1446,6 +1462,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_= cpu_def, char *features) x86_cpu_def->ext_features &=3D ~minus_features[FEAT_1_ECX]; x86_cpu_def->ext2_features &=3D ~minus_features[FEAT_8000_0001_EDX]; x86_cpu_def->ext3_features &=3D ~minus_features[FEAT_8000_0001_ECX]; + x86_cpu_def->ext4_features &=3D ~minus_features[FEAT_C000_0001_EDX]; x86_cpu_def->kvm_features &=3D ~minus_features[FEAT_KVM]; x86_cpu_def->svm_features &=3D ~minus_features[FEAT_SVM]; x86_cpu_def->cpuid_7_0_ebx_features &=3D ~minus_features[FEAT_7_0_EB= X]; --=20 1.7.10.4