summary refs log tree commit diff stats
path: root/ui/input-linux.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-03-31 11:09:51 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-03-31 11:09:51 +0100
commit05a6f451eb0e3224a8e6d98089379f20ec06c787 (patch)
tree4970642e311ac2accbac9e4ca9e49e32c6e1a68d /ui/input-linux.c
parenta0ee3797bf4917b1b7a4554a4dffbb45f387f087 (diff)
parent4eaf72029446ba693c63429475ce46348f65bf01 (diff)
downloadfocaccia-qemu-05a6f451eb0e3224a8e6d98089379f20ec06c787.tar.gz
focaccia-qemu-05a6f451eb0e3224a8e6d98089379f20ec06c787.zip
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 <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-linux.c')
0 files changed, 0 insertions, 0 deletions