aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-06-06 15:21:25 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2014-06-10 19:39:34 +0400
commit6b1dd54b6a4652a3a1e15a4beacd3be554a9ade1 (patch)
treee98cd4a85c585542db47fd02f71113e61863cbbc
parenta10678b08ecf87ef0b73426a876679178b392bcc (diff)
downloadqemu-arm-6b1dd54b6a4652a3a1e15a4beacd3be554a9ade1.tar.gz
cpu/x86: correctly set errors in x86_cpu_parse_featurestr
Because of the "goto out", the contents of local_err are leaked and lost. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--target-i386/cpu.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index dde052cc42..8983457e23 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1688,8 +1688,8 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
numvalue = strtoul(val, &err, 0);
if (!*val || *err) {
- error_setg(&local_err, "bad numerical value %s", val);
- goto out;
+ error_setg(errp, "bad numerical value %s", val);
+ return;
}
if (numvalue < 0x80000000) {
error_report("xlevel value shall always be >= 0x80000000"
@@ -1706,8 +1706,8 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
tsc_freq = strtosz_suffix_unit(val, &err,
STRTOSZ_DEFSUFFIX_B, 1000);
if (tsc_freq < 0 || *err) {
- error_setg(&local_err, "bad numerical value %s", val);
- goto out;
+ error_setg(errp, "bad numerical value %s", val);
+ return;
}
snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
object_property_parse(OBJECT(cpu), num, "tsc-frequency",
@@ -1718,8 +1718,8 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
char num[32];
numvalue = strtoul(val, &err, 0);
if (!*val || *err) {
- error_setg(&local_err, "bad numerical value %s", val);
- goto out;
+ error_setg(errp, "bad numerical value %s", val);
+ return;
}
if (numvalue < min) {
error_report("hv-spinlocks value shall always be >= 0x%x"
@@ -1738,7 +1738,7 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
}
if (local_err) {
error_propagate(errp, local_err);
- goto out;
+ return;
}
featurestr = strtok(NULL, ",");
}
@@ -1758,9 +1758,6 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
env->features[FEAT_KVM] &= ~minus_features[FEAT_KVM];
env->features[FEAT_SVM] &= ~minus_features[FEAT_SVM];
env->features[FEAT_7_0_EBX] &= ~minus_features[FEAT_7_0_EBX];
-
-out:
- return;
}
/* generate a composite string into buf of all cpuid names in featureset