From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgEB-00006w-Ta for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsgE9-00058L-Pd for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:55 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45632 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgE9-000587-Gl for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:53 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Jan 2013 21:56:26 +0100 Message-Id: <1357678594-427-10-git-send-email-afaerber@suse.de> In-Reply-To: <1357678594-427-1-git-send-email-afaerber@suse.de> References: <1357678594-427-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 09/17] target-i386: check/enforce: Fix CPUID leaf numbers on error messages 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 The -cpu check/enforce warnings are printing incorrect information about = the missing flags. There are no feature flags on CPUID leaves 0 and 0x8000000= 0, but there were references to 0 and 0x80000000 in the table at kvm_check_features_against_host(). This changes the model_features_t struct to contain the register number a= s well, so the error messages print the correct CPUID leaf+register informa= tion, instead of wrong CPUID leaf numbers. This also changes the format of the error messages, so they follow the "CPUID... [bit ]" convention used in Intel documentation. Example output: $ qemu-system-x86_64 -machine pc-1.0,accel=3Dkvm -cpu Opteron_G4,+ia6= 4,enforce warning: host doesn't support requested feature: CPUID.01H:EDX.ia64 [= bit 30] warning: host doesn't support requested feature: CPUID.01H:ECX.xsave = [bit 26] warning: host doesn't support requested feature: CPUID.01H:ECX.avx [b= it 28] warning: host doesn't support requested feature: CPUID.80000001H:ECX.= abm [bit 5] warning: host doesn't support requested feature: CPUID.80000001H:ECX.= sse4a [bit 6] warning: host doesn't support requested feature: CPUID.80000001H:ECX.= misalignsse [bit 7] warning: host doesn't support requested feature: CPUID.80000001H:ECX.= 3dnowprefetch [bit 8] warning: host doesn't support requested feature: CPUID.80000001H:ECX.= xop [bit 11] warning: host doesn't support requested feature: CPUID.80000001H:ECX.= fma4 [bit 16] Unable to find x86 CPU definition $ Signed-off-by: Eduardo Habkost Reviewed-by: Gleb Natapov Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 42 +++++++++++++++++++++++++++++++++--------- target-i386/cpu.h | 3 +++ 2 Dateien ge=C3=A4ndert, 36 Zeilen hinzugef=C3=BCgt(+), 9 Zeilen entfern= t(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 2547bfa..ddf7024 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -124,6 +124,25 @@ static const char *cpuid_7_0_ebx_feature_name[] =3D = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; =20 +const char *get_register_name_32(unsigned int reg) +{ + static const char *reg_names[CPU_NB_REGS32] =3D { + [R_EAX] =3D "EAX", + [R_ECX] =3D "ECX", + [R_EDX] =3D "EDX", + [R_EBX] =3D "EBX", + [R_ESP] =3D "ESP", + [R_EBP] =3D "EBP", + [R_ESI] =3D "ESI", + [R_EDI] =3D "EDI", + }; + + if (reg > CPU_NB_REGS32) { + return NULL; + } + return reg_names[reg]; +} + /* collects per-function cpuid data */ typedef struct model_features_t { @@ -132,7 +151,8 @@ typedef struct model_features_t { uint32_t check_feat; const char **flag_names; uint32_t cpuid; - } model_features_t; + int reg; +} model_features_t; =20 int check_cpuid =3D 0; int enforce_cpuid =3D 0; @@ -912,10 +932,13 @@ static int unavailable_host_feature(struct model_fe= atures_t *f, uint32_t mask) =20 for (i =3D 0; i < 32; ++i) if (1 << i & mask) { - fprintf(stderr, "warning: host cpuid %04x_%04x lacks request= ed" - " flag '%s' [0x%08x]\n", - f->cpuid >> 16, f->cpuid & 0xffff, - f->flag_names[i] ? f->flag_names[i] : "[reserved]", mask= ); + const char *reg =3D get_register_name_32(f->reg); + assert(reg); + fprintf(stderr, "warning: host doesn't support requested fea= ture: " + "CPUID.%02XH:%s%s%s [bit %d]\n", + f->cpuid, reg, + f->flag_names[i] ? "." : "", + f->flag_names[i] ? f->flag_names[i] : "", i); break; } return 0; @@ -934,13 +957,14 @@ static int kvm_check_features_against_host(x86_def_= t *guest_def) int rv, i; struct model_features_t ft[] =3D { {&guest_def->features, &host_def.features, - ~0, feature_name, 0x00000000}, + ~0, feature_name, 0x00000001, R_EDX}, {&guest_def->ext_features, &host_def.ext_features, - ~CPUID_EXT_HYPERVISOR, ext_feature_name, 0x00000001}, + ~CPUID_EXT_HYPERVISOR, ext_feature_name, 0x00000001, R_ECX}, {&guest_def->ext2_features, &host_def.ext2_features, - ~PPRO_FEATURES, ext2_feature_name, 0x80000000}, + ~PPRO_FEATURES, ext2_feature_name, 0x80000001, R_EDX}, {&guest_def->ext3_features, &host_def.ext3_features, - ~CPUID_EXT3_SVM, ext3_feature_name, 0x80000001}}; + ~CPUID_EXT3_SVM, ext3_feature_name, 0x80000001, R_ECX} + }; =20 assert(kvm_enabled()); =20 diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 1283537..e56921b 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1220,4 +1220,7 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAcc= ess access); =20 void enable_kvm_pv_eoi(void); =20 +/* Return name of 32-bit register, from a R_* constant */ +const char *get_register_name_32(unsigned int reg); + #endif /* CPU_I386_H */ --=20 1.7.10.4