From: Peter Maydell Date: Tue, 21 Mar 2017 14:32:51 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=41a56822e3049a83e05ebd1b0d7d040cb09a52fb;p=qemu.git 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 " # gpg: aka "Greg Kurz " # gpg: aka "Greg Kurz " # gpg: aka "Gregory Kurz (Groug) " # 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 --- 41a56822e3049a83e05ebd1b0d7d040cb09a52fb