From patchwork Fri Sep 7 22:04:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Slutz X-Patchwork-Id: 182469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 629522C008C for ; Sat, 8 Sep 2012 08:04:19 +1000 (EST) Received: from localhost ([::1]:36672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA6ev-0005XK-36 for incoming@patchwork.ozlabs.org; Fri, 07 Sep 2012 18:04:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA6en-0005XA-PW for qemu-devel@nongnu.org; Fri, 07 Sep 2012 18:04:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TA6em-0008Kb-LV for qemu-devel@nongnu.org; Fri, 07 Sep 2012 18:04:09 -0400 Received: from hub021-nj-1.exch021.serverdata.net ([206.225.164.216]:35989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA6em-0008KW-H2 for qemu-devel@nongnu.org; Fri, 07 Sep 2012 18:04:08 -0400 Received: from don-760.CloudSwitch.com (131.239.15.22) by east.exch021.serverdata.net (10.240.4.31) with Microsoft SMTP Server (TLS) id 14.2.309.2; Fri, 7 Sep 2012 15:04:06 -0700 Message-ID: <504A6F56.2060900@CloudSwitch.Com> Date: Fri, 7 Sep 2012 18:04:06 -0400 From: Don Slutz User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: Igor Mammedov References: <1347051311-16122-1-git-send-email-imammedo@redhat.com> <1347051311-16122-19-git-send-email-imammedo@redhat.com> In-Reply-To: <1347051311-16122-19-git-send-email-imammedo@redhat.com> X-detected-operating-system: by eggs.gnu.org: Windows 2000 SP2+, XP SP1+ (seldom 98) X-Received-From: 206.225.164.216 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, don.slutz@gmail.com, avi@redhat.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com Subject: Re: [Qemu-devel] [PATCH 18/22] target-i386: parse cpu_model string into set of stringified properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On 09/07/12 16:55, Igor Mammedov wrote: > cpu_model string does represent features in following format: > ([+-]feat)|(feat=foo)|(feat) > which makes it impossible directly use property infrastructure > to set features on CPU. > This patch introduces parser that splits CPU name from cpu_model and > converts legacy features string into canonized set of strings that > is compatible with property manipulation infrastructure. > > PS: > * later it could be used as a hook to convert legacy command line > features to global properties. Then marked as deprecated and > removed with -cpu option in the future. > * compiler complains that it's unused function but I guess it is > easier for review this way > > Signed-off-by: Igor Mammedov > --- > target-i386/cpu.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 0543e62..2c9cd6b 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1332,6 +1332,58 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) > env->cpuid_xlevel2 = def->xlevel2; > } > > +/* convert legacy cpumodel string to string cpu_name and > + * a uniforms set of custom features that will be applied to CPU > + * using object_property_parse() > + */ > +static void compat_normalize_cpu_model(const char *cpu_model, char **cpu_name, > + QDict **features, Error **errp) > +{ > + > + char *s = g_strdup(cpu_model); > + char *featurestr, *sptr; > + > + *cpu_name = strtok_r(s, ",", &sptr); I get: cc1: warnings being treated as errors /root/qemu-cpu-v2/target-i386/cpu.c: In function 'cpu_x86_register': /root/qemu-cpu-v2/target-i386/cpu.c:1341: error: 'sptr' may be used uninitialized in this function /root/qemu-cpu-v2/target-i386/cpu.c:1341: note: 'sptr' was declared here And the change: *features = qdict_new(); fixes this for me. > + *features = qdict_new(); > + > + featurestr = strtok_r(NULL, ",", &sptr); > + while (featurestr) { > + char *val; > + if (featurestr[0] == '+') { > + /* > + * preseve legacy behaviour, if feature was disabled once > + * do not allow to enable it again > + */ > + if (!qdict_haskey(*features, featurestr + 1)) { > + qdict_put(*features, featurestr + 1, qstring_from_str("on")); > + } > + } else if (featurestr[0] == '-') { > + qdict_put(*features, featurestr + 1, qstring_from_str("off")); > + } else { > + val = strchr(featurestr, '='); > + if (val) { > + *val = 0; val++; > + if (!strcmp(featurestr, "vendor")) { > + qdict_put(*features, "vendor-override", > + qstring_from_str("on")); > + qdict_put(*features, featurestr, qstring_from_str(val)); > + } else if (!strcmp(featurestr, "tsc_freq")) { > + qdict_put(*features, "tsc-frequency", > + qstring_from_str(val)); > + } else { > + qdict_put(*features, featurestr, qstring_from_str(val)); > + } > + } else { > + qdict_put(*features, featurestr, qstring_from_str("on")); > + } > + } > + > + featurestr = strtok_r(NULL, ",", &sptr); > + } > + > + return; > +} > + > static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, > const char *cpu_model, Error **errp) > { -Don Slutz diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e7964a3..af50a8f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1338,7 +1338,7 @@ static void compat_normalize_cpu_model(const char *cpu_model, char **cpu_name, { char *s = g_strdup(cpu_model); - char *featurestr, *sptr; + char *featurestr, *sptr = NULL; *cpu_name = strtok_r(s, ",", &sptr);