diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-11 05:14:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-11 05:14:41 +0000 |
| commit | 449008f86418583a1f0fb946cf91ee7b4797317d (patch) | |
| tree | 4ba357e852ba1b6cd0eccdabbe611f4661a5787f /linux-user/ioctls.h | |
| parent | 5c697ae74170d43928cb185f5ac1a9058adcae0b (diff) | |
| parent | bc5baffa3554e4c0d20c1dbe879aec931866bd69 (diff) | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150210.0' into staging
RCU fixes and cleanup (Paolo Bonzini)
Switch to v2 IOMMU interface (Alex Williamson)
DEBUG build fix (Alexey Kardashevskiy)
# gpg: Signature made Tue 10 Feb 2015 17:37:06 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-20150210.0:
vfio: Fix debug message compile error
vfio: Use vfio type1 v2 IOMMU interface
vfio: unmap and free BAR data in instance_finalize
vfio: free dynamically-allocated data in instance_finalize
vfio: cleanup vfio_get_device error path, remove vfio_populate_device callback
memory: unregister AddressSpace MemoryListener within BQL
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/ioctls.h')
0 files changed, 0 insertions, 0 deletions