diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-21 14:32:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-21 14:32:51 +0000 |
| commit | 41a56822e3049a83e05ebd1b0d7d040cb09a52fb (patch) | |
| tree | 303da668b77e9d4a1038b1805ffe3ee8681d1337 /include/exec/cpu-common.h | |
| parent | cc720a5dc4d096206d30f7724fc9dc5c8af4593b (diff) | |
| parent | 262169abe74b4c2d8b299b7499904cfc3c1902ea (diff) | |
| download | qemu-41a56822e3049a83e05ebd1b0d7d040cb09a52fb.zip qemu-41a56822e3049a83e05ebd1b0d7d040cb09a52fb.tar.gz qemu-41a56822e3049a83e05ebd1b0d7d040cb09a52fb.tar.bz2 | |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
This pull request fixes a potential QEMU hang in 9pfs and two issues
reported by Coverity.
# gpg: Signature made Tue 21 Mar 2017 09:57:58 GMT
# gpg: using DSA key 0x02FC3AEB0101DBC2
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg: aka "Greg Kurz <groug@free.fr>"
# gpg: aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
# gpg: aka "Gregory Kurz (Groug) <groug@free.fr>"
# gpg: aka "[jpeg image of size 3330]"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2
* remotes/gkurz/tags/for-upstream:
9pfs: proxy: assert if unmarshal fails
9pfs: don't try to flush self and avoid QEMU hang on reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/cpu-common.h')
0 files changed, 0 insertions, 0 deletions