Message ID | 1378419737-4154-1-git-send-email-zishen.lim@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, 2013-09-05 at 15:22 -0700, Zi Shen Lim wrote: > Signed-off-by: Zi Shen Lim <zishen.lim@linaro.org> > --- Applied. Thanks! Alex > Documentation/vfio.txt | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt > index d7993dc..b9ca023 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 */ > @@ -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_TYPE1_IOMMU) > + ioctl(container, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU); > > /* Get addition IOMMU info */ > ioctl(container, VFIO_IOMMU_GET_INFO, &iommu_info); > @@ -229,7 +229,7 @@ group and can access them as follows: > > irq.index = i; > > - ioctl(device, VFIO_DEVICE_GET_IRQ_INFO, ®); > + ioctl(device, VFIO_DEVICE_GET_IRQ_INFO, &irq); > > /* Setup IRQs... eventfds, VFIO_DEVICE_SET_IRQS */ > } -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt index d7993dc..b9ca023 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 */ @@ -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_TYPE1_IOMMU) + ioctl(container, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU); /* Get addition IOMMU info */ ioctl(container, VFIO_IOMMU_GET_INFO, &iommu_info); @@ -229,7 +229,7 @@ group and can access them as follows: irq.index = i; - ioctl(device, VFIO_DEVICE_GET_IRQ_INFO, ®); + ioctl(device, VFIO_DEVICE_GET_IRQ_INFO, &irq); /* Setup IRQs... eventfds, VFIO_DEVICE_SET_IRQS */ }
Signed-off-by: Zi Shen Lim <zishen.lim@linaro.org> --- Documentation/vfio.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)