LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] VFIO: Fix Documentation
       [not found] <1524218521-61496-1-git-send-email-zhangshaokun@hisilicon.com>
@ 2018-04-20 10:07 ` dongbo (E)
  2018-04-30 18:38   ` Alex Williamson
  0 siblings, 1 reply; 10+ messages in thread
From: dongbo (E) @ 2018-04-20 10:07 UTC (permalink / raw)
  To: alex.williamson, corbet; +Cc: kvm, linux-doc, linux-kernel

From: Dong Bo <dongbo4@huawei.com>

Signed-off-by: Dong Bo <dongbo4@huawei.com>
---
 Documentation/vfio.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
index ef6a511..f1a4d3c 100644
--- a/Documentation/vfio.txt
+++ b/Documentation/vfio.txt
@@ -252,15 +252,14 @@ into VFIO core.  When devices are bound and unbound to the driver,
 the driver should call vfio_add_group_dev() and vfio_del_group_dev()
 respectively::
 -	extern int vfio_add_group_dev(struct iommu_group *iommu_group,
-	                              struct device *dev,
+	extern int vfio_add_group_dev(struct device *dev,
 				      const struct vfio_device_ops *ops,
 				      void *device_data);
  	extern void *vfio_del_group_dev(struct device *dev);
  vfio_add_group_dev() indicates to the core to begin tracking the
-specified iommu_group and register the specified dev as owned by
+iommu_group of the specified dev and register the dev as owned by
 a VFIO bus driver.  The driver provides an ops structure for callbacks
 similar to a file operations structure::
 -- 1.9.1


.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] VFIO: Fix Documentation
  2018-04-20 10:07 ` [PATCH] VFIO: Fix Documentation dongbo (E)
@ 2018-04-30 18:38   ` Alex Williamson
  2018-05-07  3:09     ` dongbo (E)
  0 siblings, 1 reply; 10+ messages in thread
From: Alex Williamson @ 2018-04-30 18:38 UTC (permalink / raw)
  To: dongbo (E); +Cc: corbet, kvm, linux-doc, linux-kernel

On Fri, 20 Apr 2018 18:07:27 +0800
"dongbo (E)" <dongbo4@huawei.com> wrote:

> From: Dong Bo <dongbo4@huawei.com>
> 
> Signed-off-by: Dong Bo <dongbo4@huawei.com>
> ---

Hi Dong Bo,

The patch is corrupted, please resend and also include a commit log,
something as simple as "Update vfio_add_group_dev description to match
the current API" would be fine.  Thanks,

Alex

>  Documentation/vfio.txt | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
> index ef6a511..f1a4d3c 100644
> --- a/Documentation/vfio.txt
> +++ b/Documentation/vfio.txt
> @@ -252,15 +252,14 @@ into VFIO core.  When devices are bound and unbound to the driver,
>  the driver should call vfio_add_group_dev() and vfio_del_group_dev()
>  respectively::
>  -	extern int vfio_add_group_dev(struct iommu_group *iommu_group,
> -	                              struct device *dev,
> +	extern int vfio_add_group_dev(struct device *dev,
>  				      const struct vfio_device_ops *ops,
>  				      void *device_data);
>   	extern void *vfio_del_group_dev(struct device *dev);
>   vfio_add_group_dev() indicates to the core to begin tracking the
> -specified iommu_group and register the specified dev as owned by
> +iommu_group of the specified dev and register the dev as owned by
>  a VFIO bus driver.  The driver provides an ops structure for callbacks
>  similar to a file operations structure::
>  -- 1.9.1
> 
> 
> .
> 
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] VFIO: Fix Documentation
  2018-04-30 18:38   ` Alex Williamson
@ 2018-05-07  3:09     ` dongbo (E)
  0 siblings, 0 replies; 10+ messages in thread
From: dongbo (E) @ 2018-05-07  3:09 UTC (permalink / raw)
  To: Alex Williamson; +Cc: corbet, kvm, linux-doc, linux-kernel

Hi, Alex.

On 2018/5/1 2:38, Alex Williamson wrote:
> On Fri, 20 Apr 2018 18:07:27 +0800
> "dongbo (E)" <dongbo4@huawei.com> wrote:
> 
>> From: Dong Bo <dongbo4@huawei.com>
>>
>> Signed-off-by: Dong Bo <dongbo4@huawei.com>
>> ---
> 
> Hi Dong Bo,
> 
> The patch is corrupted, please resend and also include a commit log,
> something as simple as "Update vfio_add_group_dev description to match
> the current API" would be fine.  Thanks,
> 
> Alex
> 
Sorry for the corrupted patch. I've resent one and added the commit log
you suggested. Hope it would apply. Thanks.

Best Regards,
Dong Bo

>>  Documentation/vfio.txt | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
>> index ef6a511..f1a4d3c 100644
>> --- a/Documentation/vfio.txt
>> +++ b/Documentation/vfio.txt
>> @@ -252,15 +252,14 @@ into VFIO core.  When devices are bound and unbound to the driver,
>>  the driver should call vfio_add_group_dev() and vfio_del_group_dev()
>>  respectively::
>>  -	extern int vfio_add_group_dev(struct iommu_group *iommu_group,
>> -	                              struct device *dev,
>> +	extern int vfio_add_group_dev(struct device *dev,
>>  				      const struct vfio_device_ops *ops,
>>  				      void *device_data);
>>   	extern void *vfio_del_group_dev(struct device *dev);
>>   vfio_add_group_dev() indicates to the core to begin tracking the
>> -specified iommu_group and register the specified dev as owned by
>> +iommu_group of the specified dev and register the dev as owned by
>>  a VFIO bus driver.  The driver provides an ops structure for callbacks
>>  similar to a file operations structure::
>>  -- 1.9.1
>>
>>
>> .
>>
>>
> 
> 
> .
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] vfio: fix documentation
  2018-05-07  3:02 [PATCH] vfio: fix documentation dongbo (E)
  2018-05-07  7:53 ` Cornelia Huck
@ 2018-05-08 15:17 ` Jonathan Corbet
  1 sibling, 0 replies; 10+ messages in thread
From: Jonathan Corbet @ 2018-05-08 15:17 UTC (permalink / raw)
  To: dongbo (E); +Cc: alex.williamson, kvm, linux-doc, linux-kernel

On Mon, 7 May 2018 11:02:10 +0800
"dongbo (E)" <dongbo4@huawei.com> wrote:

> Update vfio_add_group_dev description to match the current API.
> 
> Signed-off-by: Dong Bo <dongbo4@huawei.com>

Applied, thanks.

jon

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] vfio: fix documentation
  2018-05-07  3:02 [PATCH] vfio: fix documentation dongbo (E)
@ 2018-05-07  7:53 ` Cornelia Huck
  2018-05-08 15:17 ` Jonathan Corbet
  1 sibling, 0 replies; 10+ messages in thread
From: Cornelia Huck @ 2018-05-07  7:53 UTC (permalink / raw)
  To: dongbo (E); +Cc: alex.williamson, corbet, kvm, linux-doc, linux-kernel

On Mon, 7 May 2018 11:02:10 +0800
"dongbo (E)" <dongbo4@huawei.com> wrote:

> From: Dong Bo <dongbo4@huawei.com>
> 
> Update vfio_add_group_dev description to match the current API.
> 
> Signed-off-by: Dong Bo <dongbo4@huawei.com>
> ---
>  Documentation/vfio.txt | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
> index ef6a511..f1a4d3c 100644
> --- a/Documentation/vfio.txt
> +++ b/Documentation/vfio.txt
> @@ -252,15 +252,14 @@ into VFIO core.  When devices are bound and unbound to the driver,
>  the driver should call vfio_add_group_dev() and vfio_del_group_dev()
>  respectively::
> 
> -	extern int vfio_add_group_dev(struct iommu_group *iommu_group,
> -	                              struct device *dev,
> +	extern int vfio_add_group_dev(struct device *dev,
>  				      const struct vfio_device_ops *ops,
>  				      void *device_data);
> 
>  	extern void *vfio_del_group_dev(struct device *dev);
> 
>  vfio_add_group_dev() indicates to the core to begin tracking the
> -specified iommu_group and register the specified dev as owned by
> +iommu_group of the specified dev and register the dev as owned by
>  a VFIO bus driver.  The driver provides an ops structure for callbacks
>  similar to a file operations structure::
> 

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] vfio: fix documentation
@ 2018-05-07  3:02 dongbo (E)
  2018-05-07  7:53 ` Cornelia Huck
  2018-05-08 15:17 ` Jonathan Corbet
  0 siblings, 2 replies; 10+ messages in thread
From: dongbo (E) @ 2018-05-07  3:02 UTC (permalink / raw)
  To: alex.williamson, corbet; +Cc: kvm, linux-doc, linux-kernel

From: Dong Bo <dongbo4@huawei.com>

Update vfio_add_group_dev description to match the current API.

Signed-off-by: Dong Bo <dongbo4@huawei.com>
---
 Documentation/vfio.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
index ef6a511..f1a4d3c 100644
--- a/Documentation/vfio.txt
+++ b/Documentation/vfio.txt
@@ -252,15 +252,14 @@ into VFIO core.  When devices are bound and unbound to the driver,
 the driver should call vfio_add_group_dev() and vfio_del_group_dev()
 respectively::

-	extern int vfio_add_group_dev(struct iommu_group *iommu_group,
-	                              struct device *dev,
+	extern int vfio_add_group_dev(struct device *dev,
 				      const struct vfio_device_ops *ops,
 				      void *device_data);

 	extern void *vfio_del_group_dev(struct device *dev);

 vfio_add_group_dev() indicates to the core to begin tracking the
-specified iommu_group and register the specified dev as owned by
+iommu_group of the specified dev and register the dev as owned by
 a VFIO bus driver.  The driver provides an ops structure for callbacks
 similar to a file operations structure::

-- 
1.9.1


.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] vfio: fix documentation
  2013-09-05 22:22 Zi Shen Lim
@ 2013-09-05 22:39 ` Alex Williamson
  0 siblings, 0 replies; 10+ messages in thread
From: Alex Williamson @ 2013-09-05 22:39 UTC (permalink / raw)
  To: Zi Shen Lim; +Cc: linux-kernel, kvm

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, &reg);
> +		ioctl(device, VFIO_DEVICE_GET_IRQ_INFO, &irq);
>  
>  		/* Setup IRQs... eventfds, VFIO_DEVICE_SET_IRQS */
>  	}




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] vfio: fix documentation
@ 2013-09-05 22:22 Zi Shen Lim
  2013-09-05 22:39 ` Alex Williamson
  0 siblings, 1 reply; 10+ messages in thread
From: Zi Shen Lim @ 2013-09-05 22:22 UTC (permalink / raw)
  To: alex.williamson, linux-kernel, kvm; +Cc: Zi Shen Lim

Signed-off-by: Zi Shen Lim <zishen.lim@linaro.org>
---
 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, &reg);
+		ioctl(device, VFIO_DEVICE_GET_IRQ_INFO, &irq);
 
 		/* Setup IRQs... eventfds, VFIO_DEVICE_SET_IRQS */
 	}
-- 
1.8.1.2


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] vfio: fix documentation
  2013-06-21  2:51 Alexey Kardashevskiy
@ 2013-06-21 16:20 ` Alex Williamson
  0 siblings, 0 replies; 10+ messages in thread
From: Alex Williamson @ 2013-06-21 16:20 UTC (permalink / raw)
  To: Alexey Kardashevskiy; +Cc: linux-kernel, kvm

On Fri, 2013-06-21 at 12:51 +1000, Alexey Kardashevskiy wrote:
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>  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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] vfio: fix documentation
@ 2013-06-21  2:51 Alexey Kardashevskiy
  2013-06-21 16:20 ` Alex Williamson
  0 siblings, 1 reply; 10+ messages in thread
From: Alexey Kardashevskiy @ 2013-06-21  2:51 UTC (permalink / raw)
  To: Alex Williamson, linux-kernel, kvm; +Cc: Alexey Kardashevskiy

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 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


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2018-05-08 15:17 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1524218521-61496-1-git-send-email-zhangshaokun@hisilicon.com>
2018-04-20 10:07 ` [PATCH] VFIO: Fix Documentation dongbo (E)
2018-04-30 18:38   ` Alex Williamson
2018-05-07  3:09     ` dongbo (E)
2018-05-07  3:02 [PATCH] vfio: fix documentation dongbo (E)
2018-05-07  7:53 ` Cornelia Huck
2018-05-08 15:17 ` Jonathan Corbet
  -- strict thread matches above, loose matches on Subject: below --
2013-09-05 22:22 Zi Shen Lim
2013-09-05 22:39 ` Alex Williamson
2013-06-21  2:51 Alexey Kardashevskiy
2013-06-21 16:20 ` Alex Williamson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).