[PATCH] util: Return void on iova_tree_remove

Eugenio Pérez posted 1 patch 1 year, 12 months ago
include/qemu/iova-tree.h | 4 +---
util/iova-tree.c         | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
[PATCH] util: Return void on iova_tree_remove
Posted by Eugenio Pérez 1 year, 12 months ago
It always returns IOVA_OK so nobody uses it.

Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 include/qemu/iova-tree.h | 4 +---
 util/iova-tree.c         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
index c938fb0793..16bbfdf5f8 100644
--- a/include/qemu/iova-tree.h
+++ b/include/qemu/iova-tree.h
@@ -72,10 +72,8 @@ int iova_tree_insert(IOVATree *tree, const DMAMap *map);
  * provided.  The range does not need to be exactly what has inserted,
  * all the mappings that are included in the provided range will be
  * removed from the tree.  Here map->translated_addr is meaningless.
- *
- * Return: 0 if succeeded, or <0 if error.
  */
-int iova_tree_remove(IOVATree *tree, const DMAMap *map);
+void iova_tree_remove(IOVATree *tree, const DMAMap *map);

 /**
  * iova_tree_find:
diff --git a/util/iova-tree.c b/util/iova-tree.c
index 6dff29c1f6..fee530a579 100644
--- a/util/iova-tree.c
+++ b/util/iova-tree.c
@@ -164,15 +164,13 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator)
     g_tree_foreach(tree->tree, iova_tree_traverse, iterator);
 }

-int iova_tree_remove(IOVATree *tree, const DMAMap *map)
+void iova_tree_remove(IOVATree *tree, const DMAMap *map)
 {
     const DMAMap *overlap;

     while ((overlap = iova_tree_find(tree, map))) {
         g_tree_remove(tree->tree, overlap);
     }
-
-    return IOVA_OK;
 }

 /**
--
2.27.0


Re: [PATCH] util: Return void on iova_tree_remove
Posted by Laurent Vivier 1 year, 10 months ago
Le 27/04/2022 à 17:49, Eugenio Pérez a écrit :
> It always returns IOVA_OK so nobody uses it.
> 
> Acked-by: Jason Wang <jasowang@redhat.com>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> ---
>   include/qemu/iova-tree.h | 4 +---
>   util/iova-tree.c         | 4 +---
>   2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
> index c938fb0793..16bbfdf5f8 100644
> --- a/include/qemu/iova-tree.h
> +++ b/include/qemu/iova-tree.h
> @@ -72,10 +72,8 @@ int iova_tree_insert(IOVATree *tree, const DMAMap *map);
>    * provided.  The range does not need to be exactly what has inserted,
>    * all the mappings that are included in the provided range will be
>    * removed from the tree.  Here map->translated_addr is meaningless.
> - *
> - * Return: 0 if succeeded, or <0 if error.
>    */
> -int iova_tree_remove(IOVATree *tree, const DMAMap *map);
> +void iova_tree_remove(IOVATree *tree, const DMAMap *map);
> 
>   /**
>    * iova_tree_find:
> diff --git a/util/iova-tree.c b/util/iova-tree.c
> index 6dff29c1f6..fee530a579 100644
> --- a/util/iova-tree.c
> +++ b/util/iova-tree.c
> @@ -164,15 +164,13 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator)
>       g_tree_foreach(tree->tree, iova_tree_traverse, iterator);
>   }
> 
> -int iova_tree_remove(IOVATree *tree, const DMAMap *map)
> +void iova_tree_remove(IOVATree *tree, const DMAMap *map)
>   {
>       const DMAMap *overlap;
> 
>       while ((overlap = iova_tree_find(tree, map))) {
>           g_tree_remove(tree->tree, overlap);
>       }
> -
> -    return IOVA_OK;
>   }
> 
>   /**
> --
> 2.27.0
> 
> 

Applied to my trivial-patches branch.

Thanks,
Laurent


Re: [PATCH] util: Return void on iova_tree_remove
Posted by Eugenio Perez Martin 1 year, 11 months ago
On Wed, Apr 27, 2022 at 5:50 PM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> It always returns IOVA_OK so nobody uses it.
>
> Acked-by: Jason Wang <jasowang@redhat.com>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Hi! Friendly ping about this, is it something pending from my side?

Thanks!

> ---
>  include/qemu/iova-tree.h | 4 +---
>  util/iova-tree.c         | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
> index c938fb0793..16bbfdf5f8 100644
> --- a/include/qemu/iova-tree.h
> +++ b/include/qemu/iova-tree.h
> @@ -72,10 +72,8 @@ int iova_tree_insert(IOVATree *tree, const DMAMap *map);
>   * provided.  The range does not need to be exactly what has inserted,
>   * all the mappings that are included in the provided range will be
>   * removed from the tree.  Here map->translated_addr is meaningless.
> - *
> - * Return: 0 if succeeded, or <0 if error.
>   */
> -int iova_tree_remove(IOVATree *tree, const DMAMap *map);
> +void iova_tree_remove(IOVATree *tree, const DMAMap *map);
>
>  /**
>   * iova_tree_find:
> diff --git a/util/iova-tree.c b/util/iova-tree.c
> index 6dff29c1f6..fee530a579 100644
> --- a/util/iova-tree.c
> +++ b/util/iova-tree.c
> @@ -164,15 +164,13 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator)
>      g_tree_foreach(tree->tree, iova_tree_traverse, iterator);
>  }
>
> -int iova_tree_remove(IOVATree *tree, const DMAMap *map)
> +void iova_tree_remove(IOVATree *tree, const DMAMap *map)
>  {
>      const DMAMap *overlap;
>
>      while ((overlap = iova_tree_find(tree, map))) {
>          g_tree_remove(tree->tree, overlap);
>      }
> -
> -    return IOVA_OK;
>  }
>
>  /**
> --
> 2.27.0
>
>
Re: [PATCH] util: Return void on iova_tree_remove
Posted by Peter Xu 1 year, 11 months ago
On Thu, May 12, 2022 at 05:48:47PM +0200, Eugenio Perez Martin wrote:
> On Wed, Apr 27, 2022 at 5:50 PM Eugenio Pérez <eperezma@redhat.com> wrote:
> >
> > It always returns IOVA_OK so nobody uses it.
> >
> > Acked-by: Jason Wang <jasowang@redhat.com>
> > Reviewed-by: Peter Xu <peterx@redhat.com>
> > Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> 
> Hi! Friendly ping about this, is it something pending from my side?

Don't think so. :)

This patch does look fine to go via trivial branch, Laurent?

Also copying Michael since for other iova-tree change it always go via
Michael before.

Thanks,

-- 
Peter Xu


Re: [PATCH] util: Return void on iova_tree_remove
Posted by Laurent Vivier 1 year, 11 months ago
On 12/05/2022 18:03, Peter Xu wrote:
> On Thu, May 12, 2022 at 05:48:47PM +0200, Eugenio Perez Martin wrote:
>> On Wed, Apr 27, 2022 at 5:50 PM Eugenio Pérez <eperezma@redhat.com> wrote:
>>>
>>> It always returns IOVA_OK so nobody uses it.
>>>
>>> Acked-by: Jason Wang <jasowang@redhat.com>
>>> Reviewed-by: Peter Xu <peterx@redhat.com>
>>> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
>>
>> Hi! Friendly ping about this, is it something pending from my side?
> 
> Don't think so. :)
> 
> This patch does look fine to go via trivial branch, Laurent?
> 
> Also copying Michael since for other iova-tree change it always go via
> Michael before.
> 

I can take it via qemu-trivial.

Thanks,
Laurent