From: Peter Maydell Date: Wed, 17 Jun 2015 09:13:40 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kvaneesh/tags/for-upstream-signed' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8c29f8d6b9595ac0f9ab1b41f22e91aebab482d7;p=qemu.git Merge remote-tracking branch 'remotes/kvaneesh/tags/for-upstream-signed' into staging VirtFS update: * Fix for virtfs-proxy-helper crash * Gracefully handle the error condition on input validation in virtfs-proxy-helper # gpg: Signature made Tue Jun 16 16:21:28 2015 BST using RSA key ID 04C4E23A # gpg: Good signature from "Aneesh Kumar K.V " # 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: 4846 9DE7 1860 360F A6E9 968C DE41 A4FE 04C4 E23A * remotes/kvaneesh/tags/for-upstream-signed: virtfs-proxy-helper: fail gracefully if socket path is too long virtfs-proxy-helper: add missing long option terminator Signed-off-by: Peter Maydell --- 8c29f8d6b9595ac0f9ab1b41f22e91aebab482d7