This patch series represents a second attempt at better integration of the vfio code with qemu's handling of guest IOMMUs. It is based on Paolo Bonzini's tree at git://github.com/bonzini/qemu.git (iommu branch).
ddThis series should open the way for using VFIO with a guest system containing an IOMMU by passing guest IOMMU operations through to the host IOMMU via VFIO. That's opposed to the present model of having no IOMMU in the guest, and simply mapping all guest RAM into the host IOMMU. Patch 1 is just a trivial fix for a build problem introduced in the iommu tree.
