From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.25.27.66 with SMTP id b63csp443032lfb; Thu, 9 Jun 2016 10:48:02 -0700 (PDT) X-Received: by 10.200.49.248 with SMTP id i53mr11285539qte.49.1465494482690; Thu, 09 Jun 2016 10:48:02 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u83si3998939qkl.118.2016.06.09.10.48.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 Jun 2016 10:48:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Received: from localhost ([::1]:36119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB43m-0008KU-1r for alex.bennee@linaro.org; Thu, 09 Jun 2016 13:48:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3UC-0000YF-KQ for qemu-arm@nongnu.org; Thu, 09 Jun 2016 13:11:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bB3U6-0007Y8-85 for qemu-arm@nongnu.org; Thu, 09 Jun 2016 13:11:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3U6-0007Xy-0A; Thu, 09 Jun 2016 13:11:10 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 97BB13F725; Thu, 9 Jun 2016 17:11:09 +0000 (UTC) Received: from Igors-MacBook-Pro.local.com (ovpn-204-90.brq.redhat.com [10.40.204.90]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u59HB4rV031581; Thu, 9 Jun 2016 13:11:07 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 9 Jun 2016 19:10:58 +0200 Message-Id: <1465492263-28472-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1465492263-28472-1-git-send-email-imammedo@redhat.com> References: <1465492263-28472-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 09 Jun 2016 17:11:09 +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: [Qemu-arm] [PATCH v2 1/6] target-i386: cpu: consolidate calls of object_property_parse() in x86_cpu_parse_featurestr X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mark.cave-ayland@ilande.co.uk, blauwirbel@gmail.com, qemu-arm@nongnu.org, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: pdCemTX4fw71 From: Eduardo Habkost Signed-off-by: Eduardo Habkost Reviewed-by: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- v1: - fix error handling in of +-feat, Igor Mammedov - rebase on top of "target-i386: Remove xlevel & hv-spinlocks option fixups" v2: - move error_propagate() out of loop. Eduardo Habkost --- target-i386/cpu.c | 74 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0e6d342..947cf18 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1965,43 +1965,59 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, char *featurestr; /* Single 'key=value" string being parsed */ Error *local_err = NULL; - featurestr = features ? strtok(features, ",") : NULL; + if (!features) { + return; + } + + for (featurestr = strtok(features, ","); + featurestr && !local_err; + featurestr = strtok(NULL, ",")) { + const char *name; + const char *val = NULL; + char *eq = NULL; - while (featurestr) { - char *val; + /* Compatibility syntax: */ if (featurestr[0] == '+') { add_flagname_to_bitmaps(featurestr + 1, plus_features, &local_err); + continue; } else if (featurestr[0] == '-') { add_flagname_to_bitmaps(featurestr + 1, minus_features, &local_err); - } else if ((val = strchr(featurestr, '='))) { - *val = 0; val++; - feat2prop(featurestr); - if (!strcmp(featurestr, "tsc-freq")) { - int64_t tsc_freq; - char *err; - char num[32]; - - tsc_freq = qemu_strtosz_suffix_unit(val, &err, - QEMU_STRTOSZ_DEFSUFFIX_B, 1000); - if (tsc_freq < 0 || *err) { - error_setg(errp, "bad numerical value %s", val); - return; - } - snprintf(num, sizeof(num), "%" PRId64, tsc_freq); - object_property_parse(OBJECT(cpu), num, "tsc-frequency", - &local_err); - } else { - object_property_parse(OBJECT(cpu), val, featurestr, &local_err); - } + continue; + } + + eq = strchr(featurestr, '='); + if (eq) { + *eq++ = 0; + val = eq; } else { - feat2prop(featurestr); - object_property_parse(OBJECT(cpu), "on", featurestr, &local_err); + val = "on"; } - if (local_err) { - error_propagate(errp, local_err); - return; + + feat2prop(featurestr); + name = featurestr; + + /* Special case: */ + if (!strcmp(name, "tsc-freq")) { + int64_t tsc_freq; + char *err; + char num[32]; + + tsc_freq = qemu_strtosz_suffix_unit(val, &err, + QEMU_STRTOSZ_DEFSUFFIX_B, 1000); + if (tsc_freq < 0 || *err) { + error_setg(errp, "bad numerical value %s", val); + return; + } + snprintf(num, sizeof(num), "%" PRId64, tsc_freq); + val = num; + name = "tsc-frequency"; } - featurestr = strtok(NULL, ","); + + object_property_parse(OBJECT(cpu), val, name, &local_err); + } + + if (local_err) { + error_propagate(errp, local_err); } } -- 2.7.0