[Qemu-devel] [PATCH 07/11] block: do not acquire AioContext in check_to_replace_node

[Paolo Bonzini]

The only caller does it already.

Signed-off-by: Paolo Bonzini <address@hidden>
---
 block.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/block.c b/block.c
index 694396281b..af0a9a1c22 100644
--- a/block.c
+++ b/block.c
@@ -4701,23 +4701,19 @@ bool bdrv_is_first_non_filter(BlockDriverState 
*candidate)
     return false;
 }
 
+/* Called with AioContext lock held.  */
 BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs,
                                         const char *node_name, Error **errp)
 {
     BlockDriverState *to_replace_bs = bdrv_find_node(node_name);
-    AioContext *aio_context;
 
     if (!to_replace_bs) {
         error_setg(errp, "Node name '%s' not found", node_name);
         return NULL;
     }
 
-    aio_context = bdrv_get_aio_context(to_replace_bs);
-    aio_context_acquire(aio_context);
-
     if (bdrv_op_is_blocked(to_replace_bs, BLOCK_OP_TYPE_REPLACE, errp)) {
-        to_replace_bs = NULL;
-        goto out;
+        return NULL;
     }
 
     /* We don't want arbitrary node of the BDS chain to be replaced only the 
top
@@ -4727,12 +4723,9 @@ BlockDriverState *check_to_replace_node(BlockDriverState 
*parent_bs,
      */
     if (!bdrv_recurse_is_first_non_filter(parent_bs, to_replace_bs)) {
         error_setg(errp, "Only top most non filter can be replaced");
-        to_replace_bs = NULL;
-        goto out;
+        return NULL;
     }
 
-out:
-    aio_context_release(aio_context);
     return to_replace_bs;
 }
 
-- 
2.13.0