From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= Subject: Re: [Qemu-devel] [PATCH 27/28] target-i386: kvm_cpu_fill_host: use GET_SUPPORTED_CPUID Date: Fri, 02 Nov 2012 16:34:00 +0100 Message-ID: <5093E7E8.4030007@suse.de> References: <12869995ea4f436ab76af5059fd2e9ae83c6cf9d.1351676406.git.mtosatti@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org To: Marcelo Tosatti , Anthony Liguori , Eduardo Habkost Return-path: Received: from cantor2.suse.de ([195.135.220.15]:33997 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750953Ab2KBPeG (ORCPT ); Fri, 2 Nov 2012 11:34:06 -0400 In-Reply-To: <12869995ea4f436ab76af5059fd2e9ae83c6cf9d.1351676406.git.mtosatti@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Am 31.10.2012 10:40, schrieb Marcelo Tosatti: > From: Eduardo Habkost >=20 > Change the kvm_cpu_fill_host() function to use > kvm_arch_get_supported_cpuid() instead of running the CPUID instructi= on > directly, when checking for supported CPUID features. >=20 > This should solve two problems at the same time: >=20 > * "-cpu host" was not enabling features that don't need support on > the host CPU (e.g. x2apic); > * "check" and "enforce" options were not detecting problems when the > host CPU did support a feature, but the KVM kernel code didn't > support it. >=20 > Signed-off-by: Eduardo Habkost > Signed-off-by: Marcelo Tosatti > --- > target-i386/cpu.c | 25 +++++++++++++++---------- > 1 files changed, 15 insertions(+), 10 deletions(-) >=20 > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 390ed47..4c84e9f 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -773,13 +773,13 @@ static int cpu_x86_fill_model_id(char *str) > */ > static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) > { > + KVMState *s =3D kvm_state; This broke the linux-user build: target-i386/cpu.o: In function `kvm_cpu_fill_host': /home/andreas/QEMU/qemu-rcar/target-i386/cpu.c:783: undefined reference to `kvm_state' collect2: error: ld returned 1 exit status make[1]: *** [qemu-i386] Fehler 1 make: *** [subdir-i386-linux-user] Fehler 2 Any idea how to fix? Andreas > uint32_t eax =3D 0, ebx =3D 0, ecx =3D 0, edx =3D 0; > =20 > assert(kvm_enabled()); > =20 > x86_cpu_def->name =3D "host"; > host_cpuid(0x0, 0, &eax, &ebx, &ecx, &edx); > - x86_cpu_def->level =3D eax; > x86_cpu_def->vendor1 =3D ebx; > x86_cpu_def->vendor2 =3D edx; > x86_cpu_def->vendor3 =3D ecx; > @@ -788,21 +788,24 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cp= u_def) > x86_cpu_def->family =3D ((eax >> 8) & 0x0F) + ((eax >> 20) & 0xF= =46); > x86_cpu_def->model =3D ((eax >> 4) & 0x0F) | ((eax & 0xF0000) >>= 12); > x86_cpu_def->stepping =3D eax & 0x0F; > - x86_cpu_def->ext_features =3D ecx; > - x86_cpu_def->features =3D edx; > + > + x86_cpu_def->level =3D kvm_arch_get_supported_cpuid(s, 0x0, 0, R= _EAX); > + x86_cpu_def->features =3D kvm_arch_get_supported_cpuid(s, 0x1, 0= , R_EDX); > + x86_cpu_def->ext_features =3D kvm_arch_get_supported_cpuid(s, 0x= 1, 0, R_ECX); > =20 > if (x86_cpu_def->level >=3D 7) { > - x86_cpu_def->cpuid_7_0_ebx_features =3D kvm_arch_get_support= ed_cpuid(kvm_state, 0x7, 0, R_EBX); > + x86_cpu_def->cpuid_7_0_ebx_features =3D > + kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX); > } else { > x86_cpu_def->cpuid_7_0_ebx_features =3D 0; > } > =20 > - host_cpuid(0x80000000, 0, &eax, &ebx, &ecx, &edx); > - x86_cpu_def->xlevel =3D eax; > + x86_cpu_def->xlevel =3D kvm_arch_get_supported_cpuid(s, 0x800000= 00, 0, R_EAX); > + x86_cpu_def->ext2_features =3D > + kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_EDX= ); > + x86_cpu_def->ext3_features =3D > + kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_ECX= ); > =20 > - host_cpuid(0x80000001, 0, &eax, &ebx, &ecx, &edx); > - x86_cpu_def->ext2_features =3D edx; > - x86_cpu_def->ext3_features =3D ecx; > cpu_x86_fill_model_id(x86_cpu_def->model_id); > x86_cpu_def->vendor_override =3D 0; > =20 > @@ -811,11 +814,13 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cp= u_def) > x86_cpu_def->vendor2 =3D=3D CPUID_VENDOR_VIA_2 && > x86_cpu_def->vendor3 =3D=3D CPUID_VENDOR_VIA_3) { > host_cpuid(0xC0000000, 0, &eax, &ebx, &ecx, &edx); > + eax =3D kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX= ); > if (eax >=3D 0xC0000001) { > /* Support VIA max extended level */ > x86_cpu_def->xlevel2 =3D eax; > host_cpuid(0xC0000001, 0, &eax, &ebx, &ecx, &edx); > - x86_cpu_def->ext4_features =3D edx; > + x86_cpu_def->ext4_features =3D > + kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R= _EDX); > } > } > =20 >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrn= berg