On Mon, 2013-09-30 at 17:28 +0200, Antonios Motakis wrote:
> The VFIO documentation is slightly out of date. This minor correction
> replaces references to VFIO_IOMMU_X86 with the correct reference to
> VFIO_IOMMU_TYPE1
>
> Signed-off-by: Antonios Motakis <a.motakis@xxxxxxxxxxxxxxxxxxxxxx>
> ---
> Documentation/vfio.txt | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
> index 8eda363..b4eafa6 100644
> --- a/Documentation/vfio.txt
> +++ b/Documentation/vfio.txt
> @@ -167,8 +167,8 @@ group and can access them as follows:
> int container, group, device, i;
> struct vfio_group_status group_status =
> { .argsz = sizeof(group_status) };
> - struct vfio_iommu_x86_info iommu_info = { .argsz = sizeof(iommu_info) };
> - struct vfio_iommu_x86_dma_map dma_map = { .argsz = sizeof(dma_map) };
> + struct vfio_iommu_type1_info iommu_info = { .argsz = sizeof(iommu_info) };
> + struct vfio_iommu_type1_dma_map dma_map = { .argsz = sizeof(dma_map) };
> struct vfio_device_info device_info = { .argsz = sizeof(device_info) };
>
> /* Create a new container */
> @@ -177,7 +177,7 @@ group and can access them as follows:
> if (ioctl(container, VFIO_GET_API_VERSION) != VFIO_API_VERSION)
> /* Unknown API version */
>
> - if (!ioctl(container, VFIO_CHECK_EXTENSION, VFIO_X86_IOMMU))
> + if (!ioctl(container, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU))
> /* Doesn't support the IOMMU driver we want. */
>
> /* Open the group */
> @@ -193,7 +193,7 @@ group and can access them as follows:
> ioctl(group, VFIO_GROUP_SET_CONTAINER, &container);
>
> /* Enable the IOMMU model we want */
> - ioctl(container, VFIO_SET_IOMMU, VFIO_X86_IOMMU)
> + ioctl(container, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU)
>
> /* Get addition IOMMU info */
> ioctl(container, VFIO_IOMMU_GET_INFO, &iommu_info);
Your tree seems out of date, we've already got these:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/Documentation/vfio.txt?id=dac09b57c0ff57e55dd6fa5109076c8af0468a75
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/Documentation/vfio.txt?id=b0e59b85abd42f8a525ff032d5063457e1378808
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
