From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJY-0005zC-BR for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGyJS-0004RR-4Q for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJR-0004R7-RH for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:30 -0400 From: Igor Mammedov Date: Wed, 26 Sep 2012 22:32:57 +0200 Message-Id: <1348691578-17231-22-git-send-email-imammedo@redhat.com> In-Reply-To: <1348691578-17231-1-git-send-email-imammedo@redhat.com> References: <1348691578-17231-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: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com Moving it inside CPU initializer from cpudef will help to split cpu_x86_find_by_name() into default init and user settable properties. Signed-off-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- [ehabkost: rebase on top of latest qemu.git master, where the bitmap initialization is now different] [imammedo: fix whitespace] --- target-i386/cpu.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c2e093d..d452347 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1313,6 +1313,17 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) env->cpuid_ext4_features = def->ext4_features; 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); /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on @@ -1398,7 +1409,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; @@ -1420,18 +1430,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.1