From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [uq/master PATCH 2/7] target-i386: Don't change x86_def_t struct on cpu_x86_register() Date: Fri, 31 Jan 2014 12:42:30 +0100 Message-ID: <52EB8C26.4030501@redhat.com> References: <1391111339-6958-1-git-send-email-ehabkost@redhat.com> <1391111339-6958-3-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-ea0-f175.google.com ([209.85.215.175]:52784 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753988AbaAaLmj (ORCPT ); Fri, 31 Jan 2014 06:42:39 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so2273639ead.34 for ; Fri, 31 Jan 2014 03:42:37 -0800 (PST) In-Reply-To: <1391111339-6958-3-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 eventually the x86_def_t data is going to be provided by the CPU > class, it's better to not touch it, and handle the special cases on the > X86CPU object itself. > > Current behavior of the code should stay exactly the same. > > Signed-off-by: Eduardo Habkost > --- > target-i386/cpu.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 8425212..be54f84 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1841,11 +1841,6 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp) > return; > } > > - if (kvm_enabled()) { > - def->features[FEAT_KVM] |= kvm_default_features; > - } > - def->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR; > - > 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); > @@ -1864,6 +1859,12 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp) > cpu->cache_info_passthrough = def->cache_info_passthrough; > > object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); > + > + /* Special cases not set in the x86_def_t structs: */ > + if (kvm_enabled()) { > + env->features[FEAT_KVM] |= kvm_default_features; > + } > + env->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR; > } > > X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, > Reviewed-by: Paolo Bonzini