From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXtgA-000309-UR for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXtg3-0004Wb-QP for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46618 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXtg3-0004Vd-H2 for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 2 May 2013 15:35:38 +0200 Message-Id: <1367501755-32272-13-git-send-email-afaerber@suse.de> In-Reply-To: <1367501755-32272-1-git-send-email-afaerber@suse.de> References: <1367501755-32272-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] [PATCH 12/29] target-i386: Introduce feat2prop() for CPU properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Igor Mammedov This helper replaces '_' with '-' in a uniform way. As a side effect, even custom mappings must use '-' now. Signed-off-by: Igor Mammedov [AF: Split off; operate on NUL-terminated string rather than '=3D' delimi= ter] Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f34ba23..697848d 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1307,6 +1307,16 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu= _def, const char *name) return -1; } =20 +/* Convert all '_' in a feature string option name to '-', to make featu= re + * name conform to QOM property naming rule, which uses '-' instead of '= _'. + */ +static inline void feat2prop(char *s) +{ + while ((s =3D strchr(s, '_'))) { + *s =3D '-'; + } +} + /* Parse "+feature,-feature,feature=3Dfoo" CPU feature string */ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error = **errp) @@ -1329,6 +1339,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, c= har *features, Error **errp) add_flagname_to_bitmaps(featurestr + 1, minus_features); } else if ((val =3D strchr(featurestr, '=3D'))) { *val =3D 0; val++; + feat2prop(featurestr); if (!strcmp(featurestr, "family")) { object_property_parse(OBJECT(cpu), val, featurestr, errp= ); } else if (!strcmp(featurestr, "model")) { @@ -1355,9 +1366,9 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, c= har *features, Error **errp) object_property_parse(OBJECT(cpu), num, featurestr, errp= ); } else if (!strcmp(featurestr, "vendor")) { object_property_parse(OBJECT(cpu), val, featurestr, errp= ); - } else if (!strcmp(featurestr, "model_id")) { - object_property_parse(OBJECT(cpu), val, "model-id", errp= ); - } else if (!strcmp(featurestr, "tsc_freq")) { + } else if (!strcmp(featurestr, "model-id")) { + object_property_parse(OBJECT(cpu), val, featurestr, errp= ); + } else if (!strcmp(featurestr, "tsc-freq")) { int64_t tsc_freq; char *err; char num[32]; @@ -1370,7 +1381,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, c= har *features, Error **errp) } snprintf(num, sizeof(num), "%" PRId64, tsc_freq); object_property_parse(OBJECT(cpu), num, "tsc-frequency",= errp); - } else if (!strcmp(featurestr, "hv_spinlocks")) { + } else if (!strcmp(featurestr, "hv-spinlocks")) { char *err; numvalue =3D strtoul(val, &err, 0); if (!*val || *err) { --=20 1.8.1.4