From: Peter Maydell Date: Wed, 11 Feb 2015 05:14:41 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150210.0' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=449008f86418583a1f0fb946cf91ee7b4797317d;p=qemu.git 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 " # gpg: aka "Alex Williamson " # gpg: aka "Alex Williamson " # gpg: aka "Alex Williamson " * 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 --- 449008f86418583a1f0fb946cf91ee7b4797317d