From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA5aV-0002ep-Ac for qemu-devel@nongnu.org; Fri, 07 Sep 2012 16:55:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TA5aU-00056q-8k for qemu-devel@nongnu.org; Fri, 07 Sep 2012 16:55:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA5aT-00056h-VB for qemu-devel@nongnu.org; Fri, 07 Sep 2012 16:55:38 -0400 From: Igor Mammedov Date: Fri, 7 Sep 2012 22:54:53 +0200 Message-Id: <1347051311-16122-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1347051311-16122-1-git-send-email-imammedo@redhat.com> References: <1347051311-16122-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 04/22] target-i386: filter out not TCG features if running without kvm at realize time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com, mdroth@linux.vnet.ibm.com, don.slutz@gmail.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 3f80069..567ad69 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1400,17 +1400,7 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) env->cpuid_ext2_features |= (def->features & CPUID_EXT2_AMD_ALIASES); } - if (!kvm_enabled()) { - env->cpuid_features &= TCG_FEATURES; - env->cpuid_ext_features &= TCG_EXT_FEATURES; - env->cpuid_ext2_features &= (TCG_EXT2_FEATURES -#ifdef TARGET_X86_64 - | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM -#endif - ); - env->cpuid_ext3_features &= TCG_EXT3_FEATURES; - env->cpuid_svm_features &= TCG_SVM_FEATURES; - } + object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); out: @@ -1881,6 +1871,19 @@ static void mce_init(X86CPU *cpu) void x86_cpu_realize(Object *obj, Error **errp) { X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + + if (!kvm_enabled()) { + env->cpuid_features &= TCG_FEATURES; + env->cpuid_ext_features &= TCG_EXT_FEATURES; + env->cpuid_ext2_features &= (TCG_EXT2_FEATURES +#ifdef TARGET_X86_64 + | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM +#endif + ); + env->cpuid_ext3_features &= TCG_EXT3_FEATURES; + env->cpuid_svm_features &= TCG_SVM_FEATURES; + } #ifndef CONFIG_USER_ONLY qemu_register_reset(x86_cpu_machine_reset_cb, cpu); -- 1.7.11.4