Skip to contentSkip to conversation

util: Return void on iova_tree_remove

PATCH Applied Eugenio Pérez 4 participants 5 messages Apr 27, 2022 – Jun 28, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util: Return void on iova_tree_remove

It always returns IOVA_OK so nobody uses it.

---
 include/qemu/iova-tree.h | 4 +---
 util/iova-tree.c         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
include/qemu/iova-tree.h +1 -3
index c938fb0793..16bbfdf5f8 100644
@@ -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:
util/iova-tree.c +1 -3
index 6dff29c1f6..fee530a579 100644
@@ -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

#1 lore raw
Quoted 6 lines · Eugenio Pérez

It always returns IOVA_OK so nobody uses it.

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

Thanks!

Quoted 46 lines
---
 include/qemu/iova-tree.h | 4 +---
 util/iova-tree.c         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
include/qemu/iova-tree.h +1 -3
index c938fb0793..16bbfdf5f8 100644
@@ -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:
util/iova-tree.c +1 -4
index 6dff29c1f6..fee530a579 100644
@@ -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

#2 lore raw
Quoted 9 lines · Eugenio Perez Martin
Quoted 6 lines · Eugenio Pérez

It always returns IOVA_OK so nobody uses it.

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,

Signature · 1 line
Peter Xu
#3 lore raw
Quoted 9 lines · Peter Xu
Quoted 8 lines · Eugenio Perez Martin
Quoted 6 lines · Eugenio Pérez

It always returns IOVA_OK so nobody uses it.

Quoted 9 lines
Quoted 1 line

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

#4 lore raw
In reply to Eugenio Pérez

Le 27/04/2022 à 17:49, Eugenio Pérez a écrit :

Quoted 48 lines

It always returns IOVA_OK so nobody uses it.

---
  include/qemu/iova-tree.h | 4 +---
  util/iova-tree.c         | 4 +---
  2 files changed, 2 insertions(+), 6 deletions(-)
include/qemu/iova-tree.h +1 -3
index c938fb0793..16bbfdf5f8 100644
@@ -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:
util/iova-tree.c +1 -4
index 6dff29c1f6..fee530a579 100644
@@ -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;
  }
 
  /**
--
Quoted 3 lines

2.27.0

Applied to my trivial-patches branch.

Thanks,
Laurent