Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into... master
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 4 Mar 2015 14:37:31 +0000 (14:37 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 4 Mar 2015 14:37:31 +0000 (14:37 +0000)
commit3539bbb93e944ffde31c61c369ea9eedcc5697a6
tree99a28fb6aabdfb38aa136259fa038e191cf096ef
parent576a94d8bcaa1bb07a81d9ffd2cf76095a66ad9a
parent47cbe50cc8d8e59129311bcdb827e1116e935bde
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging

Updates for QEMU 2.3-rc0:
 - Error reporting and static cleanup (Alexey Kardashevskiy)
 - Runtime mmap disable for tracing (Samuel Pitoiset)
 - Support for host directed device request (Alex Williamson)

# gpg: Signature made Mon Mar  2 18:42:50 2015 GMT using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"

* remotes/awilliam/tags/vfio-update-20150302.0:
  vfio-pci: Enable device request notification support
  vfio: allow to disable MMAP per device with -x-mmap=off option
  vfio: Make type1 listener symbols static
  vfio: Add ioctl number to error report

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>