The resulting drained section is a replacement for the AioContext.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 blockdev.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index f92dcf24bf..b2c305402d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2253,7 +2253,6 @@ void qmp_block_passwd(bool has_device, const char *device,
 {
     Error *local_err = NULL;
     BlockDriverState *bs;
-    AioContext *aio_context;
 
     bs = bdrv_lookup_bs(has_device ? device : NULL,
                         has_node_name ? node_name : NULL,
@@ -2263,12 +2262,9 @@ void qmp_block_passwd(bool has_device, const char *device,
         return;
     }
 
-    aio_context = bdrv_get_aio_context(bs);
-    aio_context_acquire(aio_context);
-
+    bdrv_drained_begin(bs);
     bdrv_add_key(bs, password, errp);
-
-    aio_context_release(aio_context);
+    bdrv_drained_end(bs);
 }
 
 /*
-- 
2.13.0

On Thu, Jul 06, 2017 at 06:38:25PM +0200, Paolo Bonzini wrote:
> The resulting drained section is a replacement for the AioContext.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  blockdev.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)

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