From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGAAV-0001nR-KB for qemu-devel@nongnu.org; Wed, 19 Feb 2014 11:38:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGAAP-0005nB-LF for qemu-devel@nongnu.org; Wed, 19 Feb 2014 11:38:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGAAP-0005my-CZ for qemu-devel@nongnu.org; Wed, 19 Feb 2014 11:38:37 -0500 Date: Wed, 19 Feb 2014 17:38:28 +0100 From: Igor Mammedov Message-ID: <20140219173828.5e0502e5@nial.usersys.redhat.com> In-Reply-To: <1392821892-26682-2-git-send-email-ehabkost@redhat.com> References: <1392821892-26682-1-git-send-email-ehabkost@redhat.com> <1392821892-26682-2-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/3] target-i386: Make kvm_default_features an array List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Peter Maydell , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Bandan Das , Anthony Liguori , Paolo Bonzini , Andreas =?ISO-8859-1?B?RuRyYmVy?= , Richard Henderson On Wed, 19 Feb 2014 11:58:10 -0300 Eduardo Habkost wrote: > We will later make the KVM-specific code affect other feature words, > too. patch doesn't apply to current master, is there dependencies on list? > > Signed-off-by: Eduardo Habkost > --- > 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 5a530b5..ee9dff1 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; > > -static uint32_t kvm_default_features = (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] = { > + [FEAT_KVM] = (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), > +}; > > void disable_kvm_pv_eoi(void) > { > - kvm_default_features &= ~(1UL << KVM_FEATURE_PV_EOI); > + kvm_default_features[FEAT_KVM] &= ~(1UL << KVM_FEATURE_PV_EOI); > } > > void host_cpuid(uint32_t function, uint32_t count, > @@ -1851,8 +1856,12 @@ static void x86_cpu_load_def(X86CPU *cpu, const char *name, Error **errp) > > /* Special cases not set in the X86CPUDefinition structs: */ > if (kvm_enabled()) { > - env->features[FEAT_KVM] |= kvm_default_features; > + FeatureWord w; > + for (w = 0; w < FEATURE_WORDS; w++) { > + env->features[w] |= kvm_default_features[w]; > + } > } > + > env->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR; > > /* sysenter isn't supported in compatibility mode on AMD,