From patchwork Wed Dec 10 19:26:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 419829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ED951400E9 for ; Thu, 11 Dec 2014 06:27:55 +1100 (AEDT) Received: from localhost ([::1]:47548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XymvR-0001aP-70 for incoming@patchwork.ozlabs.org; Wed, 10 Dec 2014 14:27:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xymuk-0000QW-8O for qemu-devel@nongnu.org; Wed, 10 Dec 2014 14:27:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xymue-0007n8-3Z for qemu-devel@nongnu.org; Wed, 10 Dec 2014 14:27:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41497) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xymud-0007mh-T2 for qemu-devel@nongnu.org; Wed, 10 Dec 2014 14:27:04 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBAJR3NE005814 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 10 Dec 2014 14:27:03 -0500 Received: from localhost (ovpn-113-88.phx2.redhat.com [10.3.113.88]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBAJR2G4015587; Wed, 10 Dec 2014 14:27:02 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 10 Dec 2014 17:26:48 -0200 Message-Id: <1418239610-3997-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1418239610-3997-1-git-send-email-ehabkost@redhat.com> References: <1418239610-3997-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Igor Mammedov Subject: [Qemu-devel] [PATCH v3 5/7] target-i386: Isolate enabled-by-default features to a separate array 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 This will make it easier to write unit tests for the feature initialization logic. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e9df33e..b6b3c4f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -464,6 +464,11 @@ static uint32_t kvm_default_unset_features[FEATURE_WORDS] = { [FEAT_8000_0001_ECX] = CPUID_EXT3_SVM, }; +/* Features that are added by default to all CPU models in any accelerator: */ +FeatureWordArray default_features_all = { + [FEAT_1_ECX] = CPUID_EXT_HYPERVISOR, +}; + void x86_cpu_compat_kvm_no_autoenable(FeatureWord w, uint32_t features) { kvm_default_features[w] &= ~features; @@ -2005,15 +2010,14 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) } /* Special cases not set in the X86CPUDefinition structs: */ - if (kvm_enabled()) { - FeatureWord w; - for (w = 0; w < FEATURE_WORDS; w++) { + for (w = 0; w < FEATURE_WORDS; w++) { + if (kvm_enabled()) { env->features[w] |= kvm_default_features[w]; env->features[w] &= ~kvm_default_unset_features[w]; } + env->features[w] |= default_features_all[w]; } - env->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR; /* sysenter isn't supported in compatibility mode on AMD, * syscall isn't supported in compatibility mode on Intel.