From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8xby-0007dy-MR for qemu-devel@nongnu.org; Thu, 30 Jan 2014 14:49:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8xbq-0006qS-Vl for qemu-devel@nongnu.org; Thu, 30 Jan 2014 14:49:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49598) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8xbq-0006q6-Mi for qemu-devel@nongnu.org; Thu, 30 Jan 2014 14:49:10 -0500 From: Eduardo Habkost Date: Thu, 30 Jan 2014 17:48:54 -0200 Message-Id: <1391111339-6958-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1391111339-6958-1-git-send-email-ehabkost@redhat.com> References: <1391111339-6958-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [uq/master PATCH 2/7] target-i386: Don't change x86_def_t struct on cpu_x86_register() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, libvir-list@redhat.com, Igor Mammedov , Paolo Bonzini , Jiri Denemark , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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, -- 1.8.4.2