diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-29 15:27:45 +0200 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-07-17 11:28:15 +0800 |
| commit | 61124f03ab7e71d269417aafddbc2501d0379bc6 (patch) | |
| tree | 321518c9ee66ce91e47c8f8f5219dc8152f87dfc /block/qed.c | |
| parent | e7569c18292e1e17004d88a4543e2dfcdb2f6d90 (diff) | |
| download | qemu-61124f03ab7e71d269417aafddbc2501d0379bc6.tar.gz | |
block: invoke .bdrv_drain callback in coroutine context and from AioContext
This will let the callback take a CoMutex in the next patch.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20170629132749.997-8-pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'block/qed.c')
| -rw-r--r-- | block/qed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/qed.c b/block/qed.c index 5792796315..6625320c8a 100644 --- a/block/qed.c +++ b/block/qed.c @@ -350,7 +350,7 @@ static void bdrv_qed_attach_aio_context(BlockDriverState *bs, } } -static void bdrv_qed_drain(BlockDriverState *bs) +static void coroutine_fn bdrv_qed_co_drain(BlockDriverState *bs) { BDRVQEDState *s = bs->opaque; @@ -359,7 +359,7 @@ static void bdrv_qed_drain(BlockDriverState *bs) */ if (s->need_check_timer && timer_pending(s->need_check_timer)) { qed_cancel_need_check_timer(s); - qed_need_check_timer_cb(s); + qed_need_check_timer_entry(s); } } @@ -1548,7 +1548,7 @@ static BlockDriver bdrv_qed = { .bdrv_check = bdrv_qed_check, .bdrv_detach_aio_context = bdrv_qed_detach_aio_context, .bdrv_attach_aio_context = bdrv_qed_attach_aio_context, - .bdrv_drain = bdrv_qed_drain, + .bdrv_co_drain = bdrv_qed_co_drain, }; static void bdrv_qed_init(void) |