* [PATCH] block: drop unused bdrv_co_drain() API
@ 2022-05-21 12:27 Stefan Hajnoczi
2022-05-23 8:02 ` Emanuele Giuseppe Esposito
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2022-05-21 12:27 UTC (permalink / raw)
To: Kevin Wolf, qemu-devel
Cc: qemu-block, Emanuele Giuseppe Esposito, Paolo Bonzini,
Stefan Hajnoczi, Fam Zheng, Alberto Faria, Hanna Reitz
bdrv_co_drain() has not been used since commit 9a0cec664eef ("mirror:
use bdrv_drained_begin/bdrv_drained_end") in 2016. Remove it so there
are fewer drain scenarios to worry about.
Use bdrv_drained_begin()/bdrv_drained_end() instead. They are "mixed"
functions that can be called from coroutine context. Unlike
bdrv_co_drain(), these functions provide control of the length of the
drained section, which is usually the right thing.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/block/block-io.h | 1 -
block/io.c | 15 ---------------
2 files changed, 16 deletions(-)
diff --git a/include/block/block-io.h b/include/block/block-io.h
index 62c84f0519..053a27141a 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -270,7 +270,6 @@ void bdrv_drained_end_no_poll(BlockDriverState *bs, int *drained_end_counter);
cond); })
void bdrv_drain(BlockDriverState *bs);
-void coroutine_fn bdrv_co_drain(BlockDriverState *bs);
int generated_co_wrapper
bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
diff --git a/block/io.c b/block/io.c
index 789e6373d5..1e9bf09a49 100644
--- a/block/io.c
+++ b/block/io.c
@@ -588,21 +588,6 @@ void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent)
BDRV_POLL_WHILE(child->bs, qatomic_read(&drained_end_counter) > 0);
}
-/*
- * Wait for pending requests to complete on a single BlockDriverState subtree,
- * and suspend block driver's internal I/O until next request arrives.
- *
- * Note that unlike bdrv_drain_all(), the caller must hold the BlockDriverState
- * AioContext.
- */
-void coroutine_fn bdrv_co_drain(BlockDriverState *bs)
-{
- IO_OR_GS_CODE();
- assert(qemu_in_coroutine());
- bdrv_drained_begin(bs);
- bdrv_drained_end(bs);
-}
-
void bdrv_drain(BlockDriverState *bs)
{
IO_OR_GS_CODE();
--
2.36.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] block: drop unused bdrv_co_drain() API
2022-05-21 12:27 [PATCH] block: drop unused bdrv_co_drain() API Stefan Hajnoczi
@ 2022-05-23 8:02 ` Emanuele Giuseppe Esposito
2022-05-23 19:39 ` Alberto Faria
2022-05-24 12:26 ` Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Emanuele Giuseppe Esposito @ 2022-05-23 8:02 UTC (permalink / raw)
To: Stefan Hajnoczi, Kevin Wolf, qemu-devel
Cc: qemu-block, Paolo Bonzini, Fam Zheng, Alberto Faria, Hanna Reitz
Am 21/05/2022 um 14:27 schrieb Stefan Hajnoczi:
> bdrv_co_drain() has not been used since commit 9a0cec664eef ("mirror:
> use bdrv_drained_begin/bdrv_drained_end") in 2016. Remove it so there
> are fewer drain scenarios to worry about.
>
> Use bdrv_drained_begin()/bdrv_drained_end() instead. They are "mixed"
> functions that can be called from coroutine context. Unlike
> bdrv_co_drain(), these functions provide control of the length of the
> drained section, which is usually the right thing.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Thank you,
Emanuele
> ---
> include/block/block-io.h | 1 -
> block/io.c | 15 ---------------
> 2 files changed, 16 deletions(-)
>
> diff --git a/include/block/block-io.h b/include/block/block-io.h
> index 62c84f0519..053a27141a 100644
> --- a/include/block/block-io.h
> +++ b/include/block/block-io.h
> @@ -270,7 +270,6 @@ void bdrv_drained_end_no_poll(BlockDriverState *bs, int *drained_end_counter);
> cond); })
>
> void bdrv_drain(BlockDriverState *bs);
> -void coroutine_fn bdrv_co_drain(BlockDriverState *bs);
>
> int generated_co_wrapper
> bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
> diff --git a/block/io.c b/block/io.c
> index 789e6373d5..1e9bf09a49 100644
> --- a/block/io.c
> +++ b/block/io.c
> @@ -588,21 +588,6 @@ void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent)
> BDRV_POLL_WHILE(child->bs, qatomic_read(&drained_end_counter) > 0);
> }
>
> -/*
> - * Wait for pending requests to complete on a single BlockDriverState subtree,
> - * and suspend block driver's internal I/O until next request arrives.
> - *
> - * Note that unlike bdrv_drain_all(), the caller must hold the BlockDriverState
> - * AioContext.
> - */
> -void coroutine_fn bdrv_co_drain(BlockDriverState *bs)
> -{
> - IO_OR_GS_CODE();
> - assert(qemu_in_coroutine());
> - bdrv_drained_begin(bs);
> - bdrv_drained_end(bs);
> -}
> -
> void bdrv_drain(BlockDriverState *bs)
> {
> IO_OR_GS_CODE();
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] block: drop unused bdrv_co_drain() API
2022-05-21 12:27 [PATCH] block: drop unused bdrv_co_drain() API Stefan Hajnoczi
2022-05-23 8:02 ` Emanuele Giuseppe Esposito
@ 2022-05-23 19:39 ` Alberto Faria
2022-05-24 12:26 ` Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Alberto Faria @ 2022-05-23 19:39 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: Kevin Wolf, qemu-devel, qemu-block, Emanuele Giuseppe Esposito,
Paolo Bonzini, Fam Zheng, Hanna Reitz
On Sat, May 21, 2022 at 1:27 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
> bdrv_co_drain() has not been used since commit 9a0cec664eef ("mirror:
> use bdrv_drained_begin/bdrv_drained_end") in 2016. Remove it so there
> are fewer drain scenarios to worry about.
>
> Use bdrv_drained_begin()/bdrv_drained_end() instead. They are "mixed"
> functions that can be called from coroutine context. Unlike
> bdrv_co_drain(), these functions provide control of the length of the
> drained section, which is usually the right thing.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alberto Faria <afaria@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] block: drop unused bdrv_co_drain() API
2022-05-21 12:27 [PATCH] block: drop unused bdrv_co_drain() API Stefan Hajnoczi
2022-05-23 8:02 ` Emanuele Giuseppe Esposito
2022-05-23 19:39 ` Alberto Faria
@ 2022-05-24 12:26 ` Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Kevin Wolf @ 2022-05-24 12:26 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: qemu-devel, qemu-block, Emanuele Giuseppe Esposito,
Paolo Bonzini, Fam Zheng, Alberto Faria, Hanna Reitz
Am 21.05.2022 um 14:27 hat Stefan Hajnoczi geschrieben:
> bdrv_co_drain() has not been used since commit 9a0cec664eef ("mirror:
> use bdrv_drained_begin/bdrv_drained_end") in 2016. Remove it so there
> are fewer drain scenarios to worry about.
>
> Use bdrv_drained_begin()/bdrv_drained_end() instead. They are "mixed"
> functions that can be called from coroutine context. Unlike
> bdrv_co_drain(), these functions provide control of the length of the
> drained section, which is usually the right thing.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-24 12:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-21 12:27 [PATCH] block: drop unused bdrv_co_drain() API Stefan Hajnoczi
2022-05-23 8:02 ` Emanuele Giuseppe Esposito
2022-05-23 19:39 ` Alberto Faria
2022-05-24 12:26 ` Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.