|
 |
586cba |
From 74c829f82eafa8e42ae94f7ace55c8aaed3bb5f4 Mon Sep 17 00:00:00 2001
|
|
|
586cba |
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
|
586cba |
Date: Wed, 27 Apr 2022 17:49:31 +0200
|
|
|
586cba |
Subject: [PATCH 05/23] util: Return void on iova_tree_remove
|
|
|
586cba |
MIME-Version: 1.0
|
|
|
586cba |
Content-Type: text/plain; charset=UTF-8
|
|
|
586cba |
Content-Transfer-Encoding: 8bit
|
|
|
586cba |
|
|
|
586cba |
RH-Author: Eugenio Pérez <eperezma@redhat.com>
|
|
|
586cba |
RH-MergeRequest: 116: vdpa: Restore device state on destination
|
|
|
586cba |
RH-Bugzilla: 2114060
|
|
|
586cba |
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
|
|
586cba |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
586cba |
RH-Commit: [4/21] 252287acca896eba7b5d2b62fc6247cfc565ba57 (eperezmartin/qemu-kvm)
|
|
|
586cba |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114060
|
|
|
586cba |
Upstream status: Merged
|
|
|
586cba |
|
|
|
586cba |
It always returns IOVA_OK so nobody uses it.
|
|
|
586cba |
|
|
|
586cba |
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
|
586cba |
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
|
586cba |
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
|
586cba |
Message-Id: <20220427154931.3166388-1-eperezma@redhat.com>
|
|
|
586cba |
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
|
586cba |
(cherry picked from commit 832fef7cc14d65f99d523f883ef384014e6476a7)
|
|
|
586cba |
---
|
|
|
586cba |
include/qemu/iova-tree.h | 4 +---
|
|
|
586cba |
util/iova-tree.c | 4 +---
|
|
|
586cba |
2 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
586cba |
|
|
|
586cba |
diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
|
|
|
586cba |
index c938fb0793..16bbfdf5f8 100644
|
|
|
586cba |
--- a/include/qemu/iova-tree.h
|
|
|
586cba |
+++ b/include/qemu/iova-tree.h
|
|
|
586cba |
@@ -72,10 +72,8 @@ int iova_tree_insert(IOVATree *tree, const DMAMap *map);
|
|
|
586cba |
* provided. The range does not need to be exactly what has inserted,
|
|
|
586cba |
* all the mappings that are included in the provided range will be
|
|
|
586cba |
* removed from the tree. Here map->translated_addr is meaningless.
|
|
|
586cba |
- *
|
|
|
586cba |
- * Return: 0 if succeeded, or <0 if error.
|
|
|
586cba |
*/
|
|
|
586cba |
-int iova_tree_remove(IOVATree *tree, const DMAMap *map);
|
|
|
586cba |
+void iova_tree_remove(IOVATree *tree, const DMAMap *map);
|
|
|
586cba |
|
|
|
586cba |
/**
|
|
|
586cba |
* iova_tree_find:
|
|
|
586cba |
diff --git a/util/iova-tree.c b/util/iova-tree.c
|
|
|
586cba |
index 6dff29c1f6..fee530a579 100644
|
|
|
586cba |
--- a/util/iova-tree.c
|
|
|
586cba |
+++ b/util/iova-tree.c
|
|
|
586cba |
@@ -164,15 +164,13 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator)
|
|
|
586cba |
g_tree_foreach(tree->tree, iova_tree_traverse, iterator);
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
-int iova_tree_remove(IOVATree *tree, const DMAMap *map)
|
|
|
586cba |
+void iova_tree_remove(IOVATree *tree, const DMAMap *map)
|
|
|
586cba |
{
|
|
|
586cba |
const DMAMap *overlap;
|
|
|
586cba |
|
|
|
586cba |
while ((overlap = iova_tree_find(tree, map))) {
|
|
|
586cba |
g_tree_remove(tree->tree, overlap);
|
|
|
586cba |
}
|
|
|
586cba |
-
|
|
|
586cba |
- return IOVA_OK;
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
/**
|
|
|
586cba |
--
|
|
|
586cba |
2.31.1
|
|
|
586cba |
|