From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b899Y-0005Ua-Dw for qemu-devel@nongnu.org; Wed, 01 Jun 2016 12:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b899P-0007tk-Tu for qemu-devel@nongnu.org; Wed, 01 Jun 2016 12:37:55 -0400 From: Igor Mammedov Date: Wed, 1 Jun 2016 18:37:26 +0200 Message-Id: <1464799050-11002-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1464799050-11002-1-git-send-email-imammedo@redhat.com> References: <1464799050-11002-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH RFC 4/8] target-i386: cpu: consolidate calls of object_property_parse() in x86_cpu_parse_featurestr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, blauwirbel@gmail.com, mark.cave-ayland@ilande.co.uk, qemu-arm@nongnu.org Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 238f69d..618aef9 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1945,12 +1945,15 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, X86CPU *cpu = X86_CPU(cs); char *featurestr; /* Single 'key=value" string being parsed */ uint32_t numvalue; + char num[32]; + const char *name; + char *err; Error *local_err = NULL; featurestr = features ? strtok(features, ",") : NULL; while (featurestr) { - char *val; + char *val = NULL; if (featurestr[0] == '+') { add_flagname_to_bitmaps(featurestr + 1, plus_features, &local_err); } else if (featurestr[0] == '-') { @@ -1958,10 +1961,8 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, } else if ((val = strchr(featurestr, '='))) { *val = 0; val++; feat2prop(featurestr); + name = featurestr; if (!strcmp(featurestr, "xlevel")) { - char *err; - char num[32]; - numvalue = strtoul(val, &err, 0); if (!*val || *err) { error_setg(errp, "bad numerical value %s", val); @@ -1973,11 +1974,9 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, numvalue += 0x80000000; } snprintf(num, sizeof(num), "%" PRIu32, numvalue); - object_property_parse(OBJECT(cpu), num, featurestr, &local_err); + val = num; } else 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); @@ -1986,12 +1985,11 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, return; } snprintf(num, sizeof(num), "%" PRId64, tsc_freq); - object_property_parse(OBJECT(cpu), num, "tsc-frequency", - &local_err); + val = num; + name = "tsc-frequency"; } else if (!strcmp(featurestr, "hv-spinlocks")) { - char *err; const int min = 0xFFF; - char num[32]; + numvalue = strtoul(val, &err, 0); if (!*val || *err) { error_setg(errp, "bad numerical value %s", val); @@ -2004,14 +2002,18 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, numvalue = min; } snprintf(num, sizeof(num), "%" PRId32, numvalue); - object_property_parse(OBJECT(cpu), num, featurestr, &local_err); - } else { - object_property_parse(OBJECT(cpu), val, featurestr, &local_err); + val = num; } } else { feat2prop(featurestr); - object_property_parse(OBJECT(cpu), "on", featurestr, &local_err); + name = featurestr; + val = (char *)"on"; } + + if (val) { + object_property_parse(OBJECT(cpu), val, name, &local_err); + } + if (local_err) { error_propagate(errp, local_err); return; -- 1.8.3.1