From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqoJK-0005Z4-K4 for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:56:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqoJH-00080b-D2 for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:56:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqoJH-00080W-5l for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:56:19 -0400 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Date: Thu, 14 Apr 2016 22:55:07 +0200 Message-Id: <1460667307-14819-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] target-i386: add AMD CPUID.1:edx aliases to x86_cpu_get_migratable_flags List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= QEMU complains about -cpu host on an AMD machine: warning: host doesn't support requested feature: CPUID.80000001H:EDX [b= it 0] For bits 0,1,3,4,5,6,7,8,9,12,13,14,15,16,17,23,24. Host does support them, but x86_cpu_get_migratable_flags filters unnamed features and drops these bits without realizing that they are aliases to CPUID.1H:EDX and have their names there. See https://bugzilla.redhat.com/show_bug.cgi?id=3D1326721 for details. Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- target-i386/cpu.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ddae932ee1b4..66bd9d0c4039 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -506,7 +506,7 @@ const char *get_register_name_32(unsigned int reg) * Returns the set of feature flags that are supported and migratable by * QEMU, for a given FeatureWord. */ -static uint32_t x86_cpu_get_migratable_flags(FeatureWord w) +static uint32_t x86_cpu_get_migratable_flags(FeatureWord w, bool is_amd) { FeatureWordInfo *wi =3D &feature_word_info[w]; uint32_t r =3D 0; @@ -514,12 +514,18 @@ static uint32_t x86_cpu_get_migratable_flags(Featur= eWord w) =20 for (i =3D 0; i < 32; i++) { uint32_t f =3D 1U << i; + FeatureWordInfo *effective_wi =3D wi; + + if (is_amd && w =3D=3D FEAT_8000_0001_EDX && f & CPUID_EXT2_AMD_= ALIASES) { + effective_wi =3D &feature_word_info[FEAT_1_EDX]; + } + /* If the feature name is unknown, it is not supported by QEMU y= et */ - if (!wi->feat_names[i]) { + if (!effective_wi->feat_names[i]) { continue; } /* Skip features known to QEMU, but explicitly marked as unmigra= table */ - if (wi->unmigratable_flags & f) { + if (effective_wi->unmigratable_flags & f) { continue; } r |=3D f; @@ -1423,8 +1429,7 @@ void x86_cpu_change_kvm_default(const char *prop, c= onst char *value) assert(pv->prop); } =20 -static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, - bool migratable_only)= ; +static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, X86CPU= *cpu); =20 #ifdef CONFIG_KVM =20 @@ -1974,7 +1979,7 @@ static void x86_cpu_parse_featurestr(CPUState *cs, = char *features, if (cpu->host_features) { for (w =3D 0; w < FEATURE_WORDS; w++) { env->features[w] =3D - x86_cpu_get_supported_feature_word(w, cpu->migratable); + x86_cpu_get_supported_feature_word(w, cpu); } } =20 @@ -2050,8 +2055,14 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(= Error **errp) return cpu_list; } =20 -static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, - bool migratable_only) +#define IS_INTEL_CPU(env) ((env)->cpuid_vendor1 =3D=3D CPUID_VENDOR_INTE= L_1 && \ + (env)->cpuid_vendor2 =3D=3D CPUID_VENDOR_INTE= L_2 && \ + (env)->cpuid_vendor3 =3D=3D CPUID_VENDOR_INTE= L_3) +#define IS_AMD_CPU(env) ((env)->cpuid_vendor1 =3D=3D CPUID_VENDOR_AMD_1 = && \ + (env)->cpuid_vendor2 =3D=3D CPUID_VENDOR_AMD_2 = && \ + (env)->cpuid_vendor3 =3D=3D CPUID_VENDOR_AMD_3) + +static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, X86CPU= *cpu) { FeatureWordInfo *wi =3D &feature_word_info[w]; uint32_t r; @@ -2065,8 +2076,8 @@ static uint32_t x86_cpu_get_supported_feature_word(= FeatureWord w, } else { return ~0; } - if (migratable_only) { - r &=3D x86_cpu_get_migratable_flags(w); + if (cpu->migratable) { + r &=3D x86_cpu_get_migratable_flags(w, IS_AMD_CPU(&cpu->env)); } return r; } @@ -2084,7 +2095,7 @@ static int x86_cpu_filter_features(X86CPU *cpu) =20 for (w =3D 0; w < FEATURE_WORDS; w++) { uint32_t host_feat =3D - x86_cpu_get_supported_feature_word(w, cpu->migratable); + x86_cpu_get_supported_feature_word(w, cpu); uint32_t requested_features =3D env->features[w]; env->features[w] &=3D host_feat; cpu->filtered_features[w] =3D requested_features & ~env->feature= s[w]; @@ -2872,13 +2883,6 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Erro= r **errp) } #endif =20 - -#define IS_INTEL_CPU(env) ((env)->cpuid_vendor1 =3D=3D CPUID_VENDOR_INTE= L_1 && \ - (env)->cpuid_vendor2 =3D=3D CPUID_VENDOR_INTE= L_2 && \ - (env)->cpuid_vendor3 =3D=3D CPUID_VENDOR_INTE= L_3) -#define IS_AMD_CPU(env) ((env)->cpuid_vendor1 =3D=3D CPUID_VENDOR_AMD_1 = && \ - (env)->cpuid_vendor2 =3D=3D CPUID_VENDOR_AMD_2 = && \ - (env)->cpuid_vendor3 =3D=3D CPUID_VENDOR_AMD_3) static void x86_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs =3D CPU(dev); --=20 2.8.1