From patchwork Tue May 24 13:22:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 625625 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 3rDbhh45cKz9t5q for ; Tue, 24 May 2016 23:23:48 +1000 (AEST) Received: from localhost ([::1]:53348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5CJG-0004a5-2g for incoming@patchwork.ozlabs.org; Tue, 24 May 2016 09:23:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5CI6-0003TI-Da for qemu-devel@nongnu.org; Tue, 24 May 2016 09:22:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5CI2-0007TP-WB for qemu-devel@nongnu.org; Tue, 24 May 2016 09:22:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5CI2-0007TJ-NE for qemu-devel@nongnu.org; Tue, 24 May 2016 09:22:30 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 27119123E1F; Tue, 24 May 2016 13:22:30 +0000 (UTC) Received: from nial.brq.redhat.com (dhcp-1-118.brq.redhat.com [10.34.1.118]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4ODMSTw026495; Tue, 24 May 2016 09:22:28 -0400 Date: Tue, 24 May 2016 15:22:27 +0200 From: Igor Mammedov To: Eduardo Habkost Message-ID: <20160524152227.7f933c59@nial.brq.redhat.com> In-Reply-To: <20160524123405.GD23701@thinpad.lan.raisama.net> References: <1462558292-2126-1-git-send-email-ehabkost@redhat.com> <1462558292-2126-9-git-send-email-ehabkost@redhat.com> <20160524141703.3379d7fe@nial.brq.redhat.com> <20160524123405.GD23701@thinpad.lan.raisama.net> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 24 May 2016 13:22:30 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 8/9] target-i386: Use "-" instead of "_" on all feature names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: libvir-list@redhat.com, Jiri Denemark , qemu-devel@nongnu.org, Andreas =?UTF-8?B?RsOkcmJlcg==?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" On Tue, 24 May 2016 09:34:05 -0300 Eduardo Habkost wrote: > On Tue, May 24, 2016 at 02:17:03PM +0200, Igor Mammedov wrote: > > On Fri, 6 May 2016 15:11:31 -0300 > > Eduardo Habkost wrote: > > > > > This makes the feature name tables in feature_word_info all match > > > the actual QOM property names we use. > > > > > > This will make the command-line interface more consistent, > > > allowing the QOM property names to be used as "-cpu" arguments > > > directly. > > > > > > Add extra feat2prop() calls to x86_cpu_parse_featurestr() to keep > > > compatibility with the old that had underscores. > > > > > > Cc: Jiri Denemark > > > Cc: libvir-list@redhat.com > > > Signed-off-by: Eduardo Habkost > > > --- > > > target-i386/cpu.c | 32 ++++++++++++++++---------------- > > > 1 file changed, 16 insertions(+), 16 deletions(-) > > > > > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > > > index 309ef55..e7365d1 100644 > > > --- a/target-i386/cpu.c > > > +++ b/target-i386/cpu.c > > > @@ -187,7 +187,7 @@ static const char *feature_name[] = { > > > }; > > > static const char *ext_feature_name[] = { > > > "pni|sse3" /* Intel,AMD sse3 */, "pclmulqdq|pclmuldq", "dtes64", "monitor", > > > - "ds_cpl", "vmx", "smx", "est", > > > + "ds-cpl", "vmx", "smx", "est", > > > "tm2", "ssse3", "cid", NULL, > > > "fma", "cx16", "xtpr", "pdcm", > > > NULL, "pcid", "dca", "sse4.1|sse4_1", > > > @@ -207,17 +207,17 @@ static const char *ext2_feature_name[] = { > > > NULL /* mtrr */, NULL /* pge */, NULL /* mca */, NULL /* cmov */, > > > NULL /* pat */, NULL /* pse36 */, NULL, NULL /* Linux mp */, > > > "nx|xd", NULL, "mmxext", NULL /* mmx */, > > > - NULL /* fxsr */, "fxsr_opt|ffxsr", "pdpe1gb" /* AMD Page1GB */, "rdtscp", > > > + NULL /* fxsr */, "fxsr-opt|ffxsr", "pdpe1gb" /* AMD Page1GB */, "rdtscp", > > > NULL, "lm|i64", "3dnowext", "3dnow", > > > }; > > > static const char *ext3_feature_name[] = { > > > - "lahf_lm" /* AMD LahfSahf */, "cmp_legacy", "svm", "extapic" /* AMD ExtApicSpace */, > > > + "lahf-lm" /* AMD LahfSahf */, "cmp-legacy", "svm", "extapic" /* AMD ExtApicSpace */, > > > "cr8legacy" /* AMD AltMovCr8 */, "abm", "sse4a", "misalignsse", > > > "3dnowprefetch", "osvw", "ibs", "xop", > > > "skinit", "wdt", NULL, "lwp", > > > - "fma4", "tce", NULL, "nodeid_msr", > > > - NULL, "tbm", "topoext", "perfctr_core", > > > - "perfctr_nb", NULL, NULL, NULL, > > > + "fma4", "tce", NULL, "nodeid-msr", > > > + NULL, "tbm", "topoext", "perfctr-core", > > > + "perfctr-nb", NULL, NULL, NULL, > > > NULL, NULL, NULL, NULL, > > > }; > > > > > > @@ -233,8 +233,8 @@ static const char *ext4_feature_name[] = { > > > }; > > > > > > static const char *kvm_feature_name[] = { > > > - "kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvmclock", > > > - "kvm_asyncpf", "kvm_steal_time", "kvm_pv_eoi", "kvm_pv_unhalt", > > > + "kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock", > > > + "kvm-asyncpf", "kvm-steal-time", "kvm-pv-eoi", "kvm-pv-unhalt", > > > NULL, NULL, NULL, NULL, > > > NULL, NULL, NULL, NULL, > > > NULL, NULL, NULL, NULL, > > > @@ -244,9 +244,9 @@ static const char *kvm_feature_name[] = { > > > }; > > > > > > static const char *svm_feature_name[] = { > > > - "npt", "lbrv", "svm_lock", "nrip_save", > > > - "tsc_scale", "vmcb_clean", "flushbyasid", "decodeassists", > > > - NULL, NULL, "pause_filter", NULL, > > > + "npt", "lbrv", "svm-lock", "nrip-save", > > > + "tsc-scale", "vmcb-clean", "flushbyasid", "decodeassists", > > > + NULL, NULL, "pause-filter", NULL, > > > "pfthreshold", NULL, NULL, NULL, > > > NULL, NULL, NULL, NULL, > > > NULL, NULL, NULL, NULL, > > > @@ -255,7 +255,7 @@ static const char *svm_feature_name[] = { > > > }; > > > > > > static const char *cpuid_7_0_ebx_feature_name[] = { > > > - "fsgsbase", "tsc_adjust", NULL, "bmi1", "hle", "avx2", NULL, "smep", > > > + "fsgsbase", "tsc-adjust", NULL, "bmi1", "hle", "avx2", NULL, "smep", > > > "bmi2", "erms", "invpcid", "rtm", NULL, NULL, "mpx", NULL, > > > "avx512f", NULL, "rdseed", "adx", "smap", NULL, "pcommit", "clflushopt", > > > "clwb", NULL, "avx512pf", "avx512er", "avx512cd", NULL, NULL, NULL, > > > @@ -1894,8 +1894,8 @@ static PropertyInfo qdev_prop_spinlocks = { > > > .set = x86_set_hv_spinlocks, > > > }; > > > > > > -/* Convert all '_' in a feature string option name to '-', to make feature > > > - * name conform to QOM property naming rule, which uses '-' instead of '_'. > > > +/* Convert all '_' in a feature string option name to '-', to keep compatibility > > > + * with old feature names that used "_" instead of "-". > > > */ > > > static inline void feat2prop(char *s) > > > { > > > @@ -1925,8 +1925,10 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, > > > while (featurestr) { > > > char *val; > > I'd place a single feat2prop() here > > and delete it from other call sites in this function. > > A previous version of this patch had it. But it would change the > property value too, not just the property name (breaking stuff > like "model-id=some_string"). > it's bug in feat2prop(), which probably should be fixed there, so it would do what comment above it says. Or as alternative: diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ca2a893..e46e4c3 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1941,14 +1941,16 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features featurestr = features ? strtok(features, ",") : NULL; while (featurestr) { - char *val; + char *val = strchr(featurestr, '='); + if (val) { + *val = 0; val++; + } + feat2prop(featurestr); if (featurestr[0] == '+') { add_flagname_to_bitmaps(featurestr + 1, plus_features, &local_err); } else if (featurestr[0] == '-') { add_flagname_to_bitmaps(featurestr + 1, minus_features, &local_err); - } else if ((val = strchr(featurestr, '='))) { - *val = 0; val++; - feat2prop(featurestr); + } else if (val) { if (!strcmp(featurestr, "xlevel")) { char *err; char num[32]; @@ -2000,7 +2002,6 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, object_property_parse(OBJECT(cpu), val, featurestr, &local_err); } } else { - feat2prop(featurestr); object_property_parse(OBJECT(cpu), "on", featurestr, &local_err); } if (local_err) {