From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCBiI-0000GA-Q0 for qemu-devel@nongnu.org; Sat, 08 Feb 2014 12:29:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCBiB-0002lX-FU for qemu-devel@nongnu.org; Sat, 08 Feb 2014 12:29:10 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45851 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCBiB-0002lT-50 for qemu-devel@nongnu.org; Sat, 08 Feb 2014 12:29:03 -0500 Message-ID: <52F6695A.7090801@suse.de> Date: Sat, 08 Feb 2014 18:28:58 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1391445551-6561-1-git-send-email-pbonzini@redhat.com> <1391445551-6561-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1391445551-6561-17-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 16/16] target-i386: Move KVM default-vendor hack to instance_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost Am 03.02.2014 17:39, schrieb Paolo Bonzini: > From: Eduardo Habkost >=20 > As we will not have a cpu_x86_find_by_name() function anymore, > move the KVM default-vendor hack to instance_init. >=20 > Unfortunately we can't move that code to class_init because it depends > on KVM being initialized. >=20 > Signed-off-by: Eduardo Habkost > Signed-off-by: Paolo Bonzini > --- > target-i386/cpu.c | 32 +++++++++++++++++++------------- > 1 file changed, 19 insertions(+), 13 deletions(-) >=20 > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index be54f84..0e8812a 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1601,18 +1601,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86= _def_t *x86_cpu_def, > def =3D &builtin_x86_defs[i]; > if (strcmp(name, def->name) =3D=3D 0) { > memcpy(x86_cpu_def, def, sizeof(*def)); > - /* sysenter isn't supported in compatibility mode on AMD, > - * syscall isn't supported in compatibility mode on Intel. > - * Normally we advertise the actual CPU vendor, but you ca= n > - * override this using the 'vendor' property if you want t= o use > - * KVM's sysenter/syscall emulation in compatibility mode = and > - * when doing cross vendor migration > - */ > - if (kvm_enabled()) { > - uint32_t ebx =3D 0, ecx =3D 0, edx =3D 0; > - host_cpuid(0, 0, NULL, &ebx, &ecx, &edx); > - x86_cpu_vendor_words2str(x86_cpu_def->vendor, ebx, edx= , ecx); > - } > return 0; > } > } > @@ -1841,7 +1829,6 @@ static void cpu_x86_register(X86CPU *cpu, const c= har *name, Error **errp) > return; > } > =20 > - object_property_set_str(OBJECT(cpu), def->vendor, "vendor", errp); > object_property_set_int(OBJECT(cpu), def->level, "level", errp); > object_property_set_int(OBJECT(cpu), def->family, "family", errp); > object_property_set_int(OBJECT(cpu), def->model, "model", errp); > @@ -1865,6 +1852,25 @@ static void cpu_x86_register(X86CPU *cpu, const = char *name, Error **errp) > env->features[FEAT_KVM] |=3D kvm_default_features; > } > env->features[FEAT_1_ECX] |=3D CPUID_EXT_HYPERVISOR; > + > + /* sysenter isn't supported in compatibility mode on AMD, > + * syscall isn't supported in compatibility mode on Intel. > + * Normally we advertise the actual CPU vendor, but you can > + * override this using the 'vendor' property if you want to use > + * KVM's sysenter/syscall emulation in compatibility mode and > + * when doing cross vendor migration > + */ > + const char *vendor =3D def->vendor; > + char host_vendor[CPUID_VENDOR_SZ + 1]; Since when is it OK to declare variables in the middle of the block? Are you planning to fix that? Once again I note that a patch to a file under my maintenance was applied without my review - and promptly a style bug slipped through. It was not a bug fix, so there was no urgency in applying it. Andreas > + if (kvm_enabled()) { > + uint32_t ebx =3D 0, ecx =3D 0, edx =3D 0; > + host_cpuid(0, 0, NULL, &ebx, &ecx, &edx); > + x86_cpu_vendor_words2str(host_vendor, ebx, edx, ecx); > + vendor =3D host_vendor; > + } > + > + object_property_set_str(OBJECT(cpu), vendor, "vendor", errp); > + > } > =20 > X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg