From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72Z-0005Pv-Sq for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO72T-0005xX-Tc for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59695 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72T-0005xP-NJ for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:17 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Mar 2014 15:54:18 +0100 Message-Id: <1394722501-32326-16-git-send-email-afaerber@suse.de> In-Reply-To: <1394722501-32326-1-git-send-email-afaerber@suse.de> References: <1394722501-32326-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0-rc0 15/58] target-i386: Make kvm_default_features an array List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost We will later make the KVM-specific code affect other feature words, too. Signed-off-by: Eduardo Habkost Acked-by: Michael S. Tsirkin Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index b32baf0..17fe45e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -358,17 +358,22 @@ typedef struct model_features_t { FeatureWord feat_word; } model_features_t; =20 -static uint32_t kvm_default_features =3D (1 << KVM_FEATURE_CLOCKSOURCE) = | +/* KVM-specific features that are automatically added to all CPU models + * when KVM is enabled. + */ +static uint32_t kvm_default_features[FEATURE_WORDS] =3D { + [FEAT_KVM] =3D (1 << KVM_FEATURE_CLOCKSOURCE) | (1 << KVM_FEATURE_NOP_IO_DELAY) | (1 << KVM_FEATURE_CLOCKSOURCE2) | (1 << KVM_FEATURE_ASYNC_PF) | (1 << KVM_FEATURE_STEAL_TIME) | (1 << KVM_FEATURE_PV_EOI) | - (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT); + (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT), +}; =20 void disable_kvm_pv_eoi(void) { - kvm_default_features &=3D ~(1UL << KVM_FEATURE_PV_EOI); + kvm_default_features[FEAT_KVM] &=3D ~(1UL << KVM_FEATURE_PV_EOI); } =20 void host_cpuid(uint32_t function, uint32_t count, @@ -1853,8 +1858,12 @@ static void x86_cpu_load_def(X86CPU *cpu, const ch= ar *name, Error **errp) =20 /* Special cases not set in the X86CPUDefinition structs: */ if (kvm_enabled()) { - env->features[FEAT_KVM] |=3D kvm_default_features; + FeatureWord w; + for (w =3D 0; w < FEATURE_WORDS; w++) { + env->features[w] |=3D kvm_default_features[w]; + } } + env->features[FEAT_1_ECX] |=3D CPUID_EXT_HYPERVISOR; =20 /* sysenter isn't supported in compatibility mode on AMD, --=20 1.8.4.5