From: Peter Maydell Date: Tue, 28 Mar 2017 08:48:23 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8c9ee217f0ee2a99d8aafa8a1db7f76176c18c99;p=qemu.git Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging This series fixes potential memory/fd leaks in 9pfs and a crash when running tests/virtio-9p-test on SPARC hosts. # gpg: Signature made Tue 28 Mar 2017 09:44:05 BST # 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: tests/virtio-9p-test: Don't call le*_to_cpus on fields of packed struct 9pfs: fix file descriptor leak Signed-off-by: Peter Maydell --- 8c9ee217f0ee2a99d8aafa8a1db7f76176c18c99