From patchwork Wed Sep 26 20:32:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 187219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CD49B2C0086 for ; Thu, 27 Sep 2012 07:27:29 +1000 (EST) Received: from localhost ([::1]:42674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJj-0006Ex-2w for incoming@patchwork.ozlabs.org; Wed, 26 Sep 2012 16:34:47 -0400 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 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8QKYQqD026673 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 26 Sep 2012 16:34:26 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8QKXMmU024195; Wed, 26 Sep 2012 16:34:23 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 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 Subject: [Qemu-devel] [PATCH 21/22] target-i386: move default init of cpuid_kvm_features bitmap into CPU initializer from cpudef X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)) {