Skip to content
This repository has been archived by the owner on Nov 5, 2019. It is now read-only.

Commit

Permalink
target-i386: Remove unused local_err variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ehabkost committed Nov 25, 2016
1 parent 00227fe commit 685479b
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions target-i386/cpu.c
Expand Up @@ -2001,7 +2001,6 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
Error **errp)
{
char *featurestr; /* Single 'key=value" string being parsed */
Error *local_err = NULL;
static bool cpu_globals_initialized;
bool ambiguous = false;

Expand All @@ -2015,7 +2014,7 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
}

for (featurestr = strtok(features, ",");
featurestr && !local_err;
featurestr;
featurestr = strtok(NULL, ",")) {
const char *name;
const char *val = NULL;
Expand Down Expand Up @@ -2086,10 +2085,6 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
error_report("warning: Compatibility of ambiguous CPU model "
"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);
Expand Down

0 comments on commit 685479b

Please sign in to comment.