From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA5bk-0005XA-O9 for qemu-devel@nongnu.org; Fri, 07 Sep 2012 16:56:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TA5bh-0005ZF-9Y for qemu-devel@nongnu.org; Fri, 07 Sep 2012 16:56:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA5bg-0005YZ-Vx for qemu-devel@nongnu.org; Fri, 07 Sep 2012 16:56:53 -0400 From: Igor Mammedov Date: Fri, 7 Sep 2012 22:55:10 +0200 Message-Id: <1347051311-16122-22-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 21/22] target-i386: move default init of cpuid_kvm_features bitmap into CPU initializer from cpudef 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 Moving it inside CPU initializer from cpudef will help to split cpu_x86_find_by_name() into default init and user settable properties. [ehabkost: rebase on top of latest qemu.git master, where the bitmap initialization is now different] [imammedo: fix whitespace Signed-off-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index fe67823..6063904 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1314,6 +1314,18 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features; env->cpuid_xlevel2 = def->xlevel2; +#if defined(CONFIG_KVM) + env->cpuid_kvm_features = (1 << KVM_FEATURE_CLOCKSOURCE) | + (1 << KVM_FEATURE_NOP_IO_DELAY) | + (1 << KVM_FEATURE_MMU_OP) | + (1 << KVM_FEATURE_CLOCKSOURCE2) | + (1 << KVM_FEATURE_ASYNC_PF) | + (1 << KVM_FEATURE_STEAL_TIME) | + (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT); +#else + env->cpuid_kvm_features = 0; +#endif + object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp); } @@ -1389,7 +1401,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, { x86_def_t *def; - CPUX86State *env = &cpu->env; QDict *features = NULL; char *name = NULL; @@ -1411,18 +1422,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, cpudef_2_x86_cpu(cpu, x86_cpu_def, errp); -#if defined(CONFIG_KVM) - env->cpuid_kvm_features = (1 << KVM_FEATURE_CLOCKSOURCE) | - (1 << KVM_FEATURE_NOP_IO_DELAY) | - (1 << KVM_FEATURE_MMU_OP) | - (1 << KVM_FEATURE_CLOCKSOURCE2) | - (1 << KVM_FEATURE_ASYNC_PF) | - (1 << KVM_FEATURE_STEAL_TIME) | - (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT); -#else - env->cpuid_kvm_features = 0; -#endif - cpu_x86_set_props(cpu, features, errp); QDECREF(features); if (error_is_set(errp)) { -- 1.7.11.4