This turns the sPAPR support on and enables VFIO container use in the kernel.
Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> --- Changes: v4: * fixed format string to use %m which is a glibc extension: "Print output of strerror(errno). No argument is required." --- hw/misc/vfio.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 4210471..882da70 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2815,6 +2815,36 @@ static int vfio_connect_container(VFIOGroup *group, VFIOAddressSpace *space) memory_listener_register(&container->iommu_data.listener, container->space->as); + } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { + ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd); + if (ret) { + error_report("vfio: failed to set group container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_SPAPR_TCE_IOMMU); + if (ret) { + error_report("vfio: failed to set iommu for container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_IOMMU_ENABLE); + if (ret) { + error_report("vfio: failed to enable container: %m"); + g_free(container); + close(fd); + return -errno; + } + + container->iommu_data.listener = vfio_memory_listener; + container->iommu_data.release = vfio_listener_release; + + memory_listener_register(&container->iommu_data.listener, + container->space->as); } else { error_report("vfio: No available IOMMU models"); g_free(container); -- 1.8.4.rc4