From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtU6S-000543-02 for qemu-devel@nongnu.org; Thu, 10 Jan 2013 21:12:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtU6Q-0000V8-KQ for qemu-devel@nongnu.org; Thu, 10 Jan 2013 21:12:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtU6Q-0000V4-Cy for qemu-devel@nongnu.org; Thu, 10 Jan 2013 21:12:14 -0500 From: Igor Mammedov Date: Fri, 11 Jan 2013 03:10:15 +0100 Message-Id: <1357870231-26762-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1357870231-26762-1-git-send-email-imammedo@redhat.com> References: <1357870231-26762-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 01/17] target-i386: move setting defaults out of cpu_x86_parse_featurestr() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, afaerber@suse.de No functional change, needed for simplifying conversion to properties. Signed-off-by: Igor Mammedov --- v2: - rebased on top of "disable kvm_mmu + -cpu "enforce" fixes (v3)" --- target-i386/cpu.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0a0a134..0f7a5eb 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1343,15 +1343,11 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features) unsigned int i; char *featurestr; /* Single 'key=value" string being parsed */ /* Features to be added */ - FeatureWordArray plus_features = { - [FEAT_KVM] = kvm_default_features, - }; + FeatureWordArray plus_features = { 0 }; /* Features to be removed */ FeatureWordArray minus_features = { 0 }; uint32_t numvalue; - add_flagname_to_bitmaps("hypervisor", plus_features); - featurestr = features ? strtok(features, ",") : NULL; while (featurestr) { @@ -1607,6 +1603,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) goto error; } + def->kvm_features |= kvm_default_features; + def->ext_features |= CPUID_EXT_HYPERVISOR; + if (cpu_x86_parse_featurestr(def, features) < 0) { goto error; } -- 1.7.1