From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [uq/master PATCH 3/7] target-i386: Move KVM default-vendor hack to instance_init Date: Fri, 31 Jan 2014 12:42:35 +0100 Message-ID: <52EB8C2B.1080407@redhat.com> References: <1391111339-6958-1-git-send-email-ehabkost@redhat.com> <1391111339-6958-4-git-send-email-ehabkost@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: =?ISO-8859-1?Q?Andreas_F=E4rber?= , Igor Mammedov , kvm@vger.kernel.org, libvir-list@redhat.com, Jiri Denemark To: Eduardo Habkost , qemu-devel@nongnu.org Return-path: Received: from mail-ee0-f47.google.com ([74.125.83.47]:39316 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753988AbaAaLmm (ORCPT ); Fri, 31 Jan 2014 06:42:42 -0500 Received: by mail-ee0-f47.google.com with SMTP id d49so2188885eek.20 for ; Fri, 31 Jan 2014 03:42:41 -0800 (PST) In-Reply-To: <1391111339-6958-4-git-send-email-ehabkost@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Il 30/01/2014 20:48, Eduardo Habkost ha scritto: > As we will not have a cpu_x86_find_by_name() function anymore, > move the KVM default-vendor hack to instance_init. > > Unfortunately we can't move that code to class_init because it depends > on KVM being initialized. > > Signed-off-by: Eduardo Habkost > --- > target-i386/cpu.c | 32 +++++++++++++++++++------------- > 1 file changed, 19 insertions(+), 13 deletions(-) > > 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 = &builtin_x86_defs[i]; > if (strcmp(name, def->name) == 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 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 > - */ > - if (kvm_enabled()) { > - uint32_t ebx = 0, ecx = 0, edx = 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 char *name, Error **errp) > return; > } > > - 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] |= kvm_default_features; > } > env->features[FEAT_1_ECX] |= 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 = def->vendor; > + char host_vendor[CPUID_VENDOR_SZ + 1]; > + if (kvm_enabled()) { > + uint32_t ebx = 0, ecx = 0, edx = 0; > + host_cpuid(0, 0, NULL, &ebx, &ecx, &edx); > + x86_cpu_vendor_words2str(host_vendor, ebx, edx, ecx); > + vendor = host_vendor; > + } > + > + object_property_set_str(OBJECT(cpu), vendor, "vendor", errp); > + > } > > X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, > Reviewed-by: Paolo Bonzini