[Qemu-devel] [PATCH for 2.9 v3 11/10] block, async: Remove unused *_enter_if_inactive()

[Kevin Wolf]

Signed-off-by: Kevin Wolf <address@hidden>
---
 block.c               | 5 -----
 include/block/aio.h   | 9 ---------
 include/block/block.h | 6 ------
 util/async.c          | 7 -------
 4 files changed, 27 deletions(-)

diff --git a/block.c b/block.c
index e65b906..086a12d 100644
--- a/block.c
+++ b/block.c
@@ -4329,11 +4329,6 @@ void bdrv_coroutine_enter(BlockDriverState *bs, 
Coroutine *co)
     aio_co_enter(bdrv_get_aio_context(bs), co);
 }
 
-void bdrv_coroutine_enter_if_inactive(BlockDriverState *bs, Coroutine *co)
-{
-    aio_co_enter_if_inactive(bdrv_get_aio_context(bs), co);
-}
-
 static void bdrv_do_remove_aio_context_notifier(BdrvAioNotifier *ban)
 {
     QLIST_REMOVE(ban, list);
diff --git a/include/block/aio.h b/include/block/aio.h
index b0a6bb3..406e323 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -520,15 +520,6 @@ void aio_co_wake(struct Coroutine *co);
 void aio_co_enter(AioContext *ctx, struct Coroutine *co);
 
 /**
- * aio_co_enter_if_inactive:
- * @ctx: the context to run the coroutine
- * @co: the coroutine to run
- *
- * Enter a coroutine in the specified AioContext, if it's not already entered.
- */
-void aio_co_enter_if_inactive(AioContext *ctx, struct Coroutine *co);
-
-/**
  * Return the AioContext whose event loop runs in the current thread.
  *
  * If called from an IOThread this will be the IOThread's AioContext.  If
diff --git a/include/block/block.h b/include/block/block.h
index dd9416e..97d4330 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -563,12 +563,6 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs);
 void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co);
 
 /**
- * Transfer control to @co in the aio context of @bs if it's not active (i.e.
- * part of the call stack of the running coroutine). Otherwise, do nothing.
- */
-void bdrv_coroutine_enter_if_inactive(BlockDriverState *bs, Coroutine *co);
-
-/**
  * bdrv_set_aio_context:
  *
  * Changes the #AioContext used for fd handlers, timers, and BHs by this
diff --git a/util/async.c b/util/async.c
index 507671a..355af73 100644
--- a/util/async.c
+++ b/util/async.c
@@ -474,13 +474,6 @@ void aio_co_enter(AioContext *ctx, struct Coroutine *co)
     }
 }
 
-void aio_co_enter_if_inactive(AioContext *ctx, struct Coroutine *co)
-{
-    if (!qemu_coroutine_entered(co)) {
-        aio_co_enter(ctx, co);
-    }
-}
-
 void aio_context_ref(AioContext *ctx)
 {
     g_source_ref(&ctx->source);
-- 
1.8.3.1