From: Peter Maydell Date: Wed, 25 Jan 2017 17:54:14 +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=c7f1cf01b8245762ca5864e835d84f6677ae8b1f;p=qemu.git Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging This pull request fixes a 2.9 regression and a long standing bug that can cause 9p clients to hang. Other patches are minor enhancements. # gpg: Signature made Wed 25 Jan 2017 10:12:27 GMT # gpg: using DSA key 0x02FC3AEB0101DBC2 # gpg: Good signature from "Greg Kurz " # gpg: aka "Greg Kurz " # gpg: aka "Greg Kurz " # gpg: aka "Greg Kurz " # gpg: aka "Gregory Kurz (Groug) " # gpg: aka "Gregory Kurz (Cimai Technology) " # gpg: aka "Gregory Kurz (Meiosys Technology) " # 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: fix offset error in v9fs_xattr_read() 9pfs: local: trivial cosmetic fix in pwritev op 9pfs: fix off-by-one error in PDU free list tests: virtio-9p: improve error reporting 9pfs: add missing coroutine_fn annotations Signed-off-by: Peter Maydell --- c7f1cf01b8245762ca5864e835d84f6677ae8b1f