Coverity fix on target-i386

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYOK0nAAoJECgHk2+YTcWmMroP/3DpibycUYbHPBioAAmJ1ohU
 V593XjRI2aT4MGfMsmi2bP+Lj8UVLtosGqYn6DUkyu/HKmXANC8uEe2/+rgPdqHZ
 kLdS4Y949LWp0mWtp1G5yBuh3z1vtjKeelVMvHd/AxDMSYbETw5Tj3fzwp7WZfSw
 7iybvQaPFJEj+AoMYbppfIHkb8vGEXy+IzfWGdcwfVEn7809rEvGneYXifQxa5KR
 XMG/AAuSw5tUpCRnxChlAucMoYjjRV7XkQ2LZkSyt66ElGOlyK8oR6c0DwItz6Zi
 7K21Z5UnSPVG4MlUpvNxpVRmruaOcpOnqJNucj3xXQ5CaoKPQxTu5l6vdhDYD+pv
 /NDjSpjjwblp3vCmyTrgDUIHH6gGubugL0RKLlxN9Tgrb7Tu2+NgThQdbdgULuLt
 2+rV5CmYKV8NGgBv0DyIEmMj8hKGjIzGzTNSbq4A5sBmzFSbpFem2N5wb/fU//Y5
 320aFdJ4d68vHB+/4uN37mmF2kvyqNPf6mRYgSM7IH0QWfaFfQ/FDn8czU8JJqYb
 q7vhSkSpDwnahfZntfvI/926tWx2daYhNE8qHqsTey6BD1MbSrp/jI/P4qR2J8lu
 EWZbJcqrZ+30X3DrPSCqSv1UR5qP24IigVmZvmjG2RjeIzo5qENY8aSUInd7cT2I
 lhf1sBhDm+3NjljAcE82
 =RGQi
 -----END PGP SIGNATURE-----

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: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2016-11-28 16:33:41 +00:00
commit 406c97c41f

View File

@ -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);