Commit 406c97c4 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'ehabkost/tags/x86-pull-request' into staging 



Coverity fix on target-i386

# gpg: Signature made Fri 25 Nov 2016 09:29:11 PM GMT
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* ehabkost/tags/x86-pull-request:
  target-i386: Remove unused local_err variable

Message-id: 1480109401-19470-1-git-send-email-ehabkost@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 511008f5 685479bd

target-i386/cpu.c

+1 −6
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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);