From: Peter Maydell Date: Fri, 31 Mar 2017 10:09:51 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2017-03-30-tag' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=05a6f451eb0e3224a8e6d98089379f20ec06c787;p=qemu.git Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2017-03-30-tag' into staging qemu-ga patch queue for 2.9 * fix make check failure of guest-get-fsinfo when nested virtual block device partitions are mounted in the test environment * fix static compilation for mingw builds # gpg: Signature made Fri 31 Mar 2017 04:52:40 BST # gpg: using RSA key 0x3353C9CEF108B584 # gpg: Good signature from "Michael Roth " # gpg: aka "Michael Roth " # gpg: aka "Michael Roth " # Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584 * remotes/mdroth/tags/qga-pull-2017-03-30-tag: qga: Make qemu-ga compile statically for Windows qga: don't fail if mount doesn't have slave devices Signed-off-by: Peter Maydell --- 05a6f451eb0e3224a8e6d98089379f20ec06c787