2013-06-21 02:52:08

by Alexey Kardashevskiy

Subject: [PATCH] vfio: fix documentation

Signed-off-by: Alexey Kardashevskiy <[email protected]>
---
Documentation/vfio.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
index c55533c..d7993dc 100644
--- a/Documentation/vfio.txt
+++ b/Documentation/vfio.txt
@@ -172,12 +172,12 @@ group and can access them as follows:
struct vfio_device_info device_info = { .argsz = sizeof(device_info) };

/* Create a new container */
- container = open("/dev/vfio/vfio, O_RDWR);
+ container = open("/dev/vfio/vfio", O_RDWR);

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);
--
1.7.10.4

2013-06-21 16:20:55

by Alex Williamson

Subject: Re: [PATCH] vfio: fix documentation

On Fri, 2013-06-21 at 12:51 +1000, Alexey Kardashevskiy wrote:
> Signed-off-by: Alexey Kardashevskiy <[email protected]>
> ---
> Documentation/vfio.txt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
> index c55533c..d7993dc 100644
> --- a/Documentation/vfio.txt
> +++ b/Documentation/vfio.txt
> @@ -172,12 +172,12 @@ group and can access them as follows:
> struct vfio_device_info device_info = { .argsz = sizeof(device_info) };
>
> /* Create a new container */
> - container = open("/dev/vfio/vfio, O_RDWR);
> + container = open("/dev/vfio/vfio", O_RDWR);
>
> 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);


Applied. Thanks,

Alex