@@ -388,7 +388,7 @@ static void laio_free_ioq(struct qemu_laio_state *s, LaioQueue *ioq)
s->io_q = NULL;
}
-static struct qemu_laio_state *laio_state_alloc(void)
+static struct qemu_laio_state *laio_state_alloc(AioContext *context)
{
struct qemu_laio_state *s;
@@ -401,6 +401,10 @@ static struct qemu_laio_state *laio_state_alloc(void)
goto out_close_efd;
}
+ s->io_q = laio_alloc_ioq(context, s);
+ s->completion_bh = aio_bh_new(context, qemu_laio_completion_bh, s);
+ aio_set_event_notifier(context, &s->e, qemu_laio_completion_cb);
+
return s;
out_close_efd:
@@ -410,8 +414,12 @@ out_free_state:
return NULL;
}
-static void laio_state_free(struct qemu_laio_state *s)
+static void laio_state_free(struct qemu_laio_state *s, AioContext *context)
{
+ aio_set_event_notifier(context, &s->e, NULL);
+ qemu_bh_delete(s->completion_bh);
+
+ laio_free_ioq(s, s->io_q);
event_notifier_cleanup(&s->e);
if (io_destroy(s->ctx) != 0) {
@@ -424,25 +432,15 @@ static void laio_state_free(struct qemu_laio_state *s)
void laio_detach_aio_context(void *s_, AioContext *old_context)
{
QemuLaioState *qs = s_;
- struct qemu_laio_state *s = qs->state;
- aio_set_event_notifier(old_context, &s->e, NULL);
- qemu_bh_delete(s->completion_bh);
-
- laio_free_ioq(s, s->io_q);
- laio_state_free(s);
+ laio_state_free(qs->state, old_context);
qs->state = NULL;
}
void laio_attach_aio_context(void *s_, AioContext *new_context)
{
QemuLaioState *qs = s_;
- struct qemu_laio_state *s = laio_state_alloc();
-
- s->io_q = laio_alloc_ioq(new_context, s);
-
- s->completion_bh = aio_bh_new(new_context, qemu_laio_completion_bh, s);
- aio_set_event_notifier(new_context, &s->e, qemu_laio_completion_cb);
+ struct qemu_laio_state *s = laio_state_alloc(new_context);
qs->state = s;
}
Now lifetime of 'completion_bh', io queue and io context is same, so move their allocation into laio_state_alloc() and their releasing into laio_state_free(). Signed-off-by: Ming Lei <ming.lei@canonical.com> --- block/linux-aio.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)