diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-12-04 10:55:03 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-12-04 10:55:03 +0000 |
| commit | 61e3aa25b129b48d8a8cb851aae2a787af7ca5e1 (patch) | |
| tree | 8f4736f6b89ce02748b96d9c0b4db24cf6959760 /crypto/tlscreds.c | |
| parent | f33d046d233084f908825bc1a4ec79f1796ca803 (diff) | |
| parent | 98475746b357f6c048caf9e001998d8a0618b2e4 (diff) | |
| download | qemu-61e3aa25b129b48d8a8cb851aae2a787af7ca5e1.tar.gz qemu-61e3aa25b129b48d8a8cb851aae2a787af7ca5e1.tar.bz2 qemu-61e3aa25b129b48d8a8cb851aae2a787af7ca5e1.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-12-04' into staging
trivial patches for 2015-12-04
# gpg: Signature made Fri 04 Dec 2015 06:40:23 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-12-04:
bt: check struct sizes
typedefs: Put them back into alphabetical order
scsi: remove scsi_req_free prototype
gt64xxx: fix decoding of ISD register
configure: use appropriate code fragment for -fstack-protector checks
crypto: avoid two coverity false positive error reports
configure: Diagnose broken linkers directly
bt: avoid unintended sign extension
util/id: fully allocate names table
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'crypto/tlscreds.c')
| -rw-r--r-- | crypto/tlscreds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c index 5ec982c6ee..e7d9c1cfac 100644 --- a/crypto/tlscreds.c +++ b/crypto/tlscreds.c @@ -123,10 +123,10 @@ qcrypto_tls_creds_get_path(QCryptoTLSCreds *creds, goto cleanup; } - trace_qcrypto_tls_creds_get_path(creds, filename, - *cred ? *cred : "<none>"); ret = 0; cleanup: + trace_qcrypto_tls_creds_get_path(creds, filename, + *cred ? *cred : "<none>"); return ret; } |