mirror of https://gitee.com/openkylin/qemu.git
target-i386: Remove unused local_err variable
local_err can never be set to non-NULL. Remove the variable. Detected by Coverity: *** CID 1365201: Possible Control flow issues (DEADCODE) /target-i386/cpu.c: 2050 in x86_cpu_parse_featurestr() 2044 prop->value = g_strdup(val); 2045 prop->errp = &error_fatal; 2046 qdev_prop_register_global(prop); 2047 } 2048 2049 if (local_err) { >>> CID 1365201: Possible Control flow issues (DEADCODE) >>> Execution cannot reach this statement: "error_propagate(errp, local...". 2050 error_propagate(errp, local_err); 2051 } 2052 } 2053 2054 static void x86_cpu_load_features(X86CPU *cpu, Error **errp); 2055 static int x86_cpu_filter_features(X86CPU *cpu); Reported-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1480087313-15102-1-git-send-email-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
00227fefd2
commit
685479bd5d
|
@ -2001,7 +2001,6 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
char *featurestr; /* Single 'key=value" string being parsed */
|
char *featurestr; /* Single 'key=value" string being parsed */
|
||||||
Error *local_err = NULL;
|
|
||||||
static bool cpu_globals_initialized;
|
static bool cpu_globals_initialized;
|
||||||
bool ambiguous = false;
|
bool ambiguous = false;
|
||||||
|
|
||||||
|
@ -2015,7 +2014,7 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
|
||||||
}
|
}
|
||||||
|
|
||||||
for (featurestr = strtok(features, ",");
|
for (featurestr = strtok(features, ",");
|
||||||
featurestr && !local_err;
|
featurestr;
|
||||||
featurestr = strtok(NULL, ",")) {
|
featurestr = strtok(NULL, ",")) {
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *val = NULL;
|
const char *val = NULL;
|
||||||
|
@ -2086,10 +2085,6 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
|
||||||
error_report("warning: Compatibility of ambiguous CPU model "
|
error_report("warning: Compatibility of ambiguous CPU model "
|
||||||
"strings won't be kept on future QEMU versions");
|
"strings won't be kept on future QEMU versions");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (local_err) {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void x86_cpu_load_features(X86CPU *cpu, Error **errp);
|
static void x86_cpu_load_features(X86CPU *cpu, Error **errp);
|
||||||
|
|
Loading…
Reference in New Issue