[PATCH] block: Move bdrv_drain_all_end_quiesce() to block_int.h

[PATCH] block: Move bdrv_drain_all_end_quiesce() to block_int.h

[Greg Kurz]

This function is really an internal helper for bdrv_close(). Update its
doc comment to make this clear and make the function private.

Signed-off-by: Greg Kurz <groug@kaod.org>
---

As suggested by Stefan here:

https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg08235.html
---
 include/block/block.h     |    6 ------
 include/block/block_int.h |    9 +++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/block/block.h b/include/block/block.h
index 809987017631..d16c401cb44e 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -779,12 +779,6 @@ void bdrv_drained_end(BlockDriverState *bs);
  */
 void bdrv_drained_end_no_poll(BlockDriverState *bs, int *drained_end_counter);
 
-/**
- * End all quiescent sections started by bdrv_drain_all_begin(). This is
- * only needed when deleting a BDS before bdrv_drain_all_end() is called.
- */
-void bdrv_drain_all_end_quiesce(BlockDriverState *bs);
-
 /**
  * End a quiescent section started by bdrv_subtree_drained_begin().
  */
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 38cad9d15c50..95d9333be14f 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -1407,4 +1407,13 @@ static inline BlockDriverState *bdrv_primary_bs(BlockDriverState *bs)
     return child_bs(bdrv_primary_child(bs));
 }
 
+/**
+ * End all quiescent sections started by bdrv_drain_all_begin(). This is
+ * needed when deleting a BDS before bdrv_drain_all_end() is called.
+ *
+ * NOTE: this is an internal helper for bdrv_close() *only*. No one else
+ * should call it.
+ */
+void bdrv_drain_all_end_quiesce(BlockDriverState *bs);
+
 #endif /* BLOCK_INT_H */

Re: [PATCH] block: Move bdrv_drain_all_end_quiesce() to block_int.h

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 572 bytes --]

On Wed, Oct 28, 2020 at 09:07:34AM +0100, Greg Kurz wrote:
> This function is really an internal helper for bdrv_close(). Update its
> doc comment to make this clear and make the function private.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> 
> As suggested by Stefan here:
> 
> https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg08235.html
> ---
>  include/block/block.h     |    6 ------
>  include/block/block_int.h |    9 +++++++++
>  2 files changed, 9 insertions(+), 6 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] block: Move bdrv_drain_all_end_quiesce() to block_int.h

[Max Reitz]

On 28.10.20 09:07, Greg Kurz wrote:
> This function is really an internal helper for bdrv_close(). Update its
> doc comment to make this clear and make the function private.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> 
> As suggested by Stefan here:
> 
> https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg08235.html
> ---
>  include/block/block.h     |    6 ------
>  include/block/block_int.h |    9 +++++++++
>  2 files changed, 9 insertions(+), 6 deletions(-)

Thanks, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max