|
@@ -2924,17 +2924,21 @@ static void bdrv_attach_child_common_abort(void *opaque)
|
|
|
}
|
|
|
|
|
|
if (bdrv_child_get_parent_aio_context(s->child) != s->old_parent_ctx) {
|
|
|
- GSList *ignore;
|
|
|
+ Transaction *tran;
|
|
|
+ GHashTable *visited;
|
|
|
+ bool ret;
|
|
|
|
|
|
- /* No need to ignore `child`, because it has been detached already */
|
|
|
- ignore = NULL;
|
|
|
- s->child->klass->can_set_aio_ctx(s->child, s->old_parent_ctx, &ignore,
|
|
|
- &error_abort);
|
|
|
- g_slist_free(ignore);
|
|
|
+ tran = tran_new();
|
|
|
|
|
|
- ignore = NULL;
|
|
|
- s->child->klass->set_aio_ctx(s->child, s->old_parent_ctx, &ignore);
|
|
|
- g_slist_free(ignore);
|
|
|
+ /* No need to visit `child`, because it has been detached already */
|
|
|
+ visited = g_hash_table_new(NULL, NULL);
|
|
|
+ ret = s->child->klass->change_aio_ctx(s->child, s->old_parent_ctx,
|
|
|
+ visited, tran, &error_abort);
|
|
|
+ g_hash_table_destroy(visited);
|
|
|
+
|
|
|
+ /* transaction is supposed to always succeed */
|
|
|
+ assert(ret == true);
|
|
|
+ tran_commit(tran);
|
|
|
}
|
|
|
|
|
|
bdrv_unref(bs);
|
|
@@ -2989,18 +2993,20 @@ static BdrvChild *bdrv_attach_child_common(BlockDriverState *child_bs,
|
|
|
Error *local_err = NULL;
|
|
|
int ret = bdrv_try_set_aio_context(child_bs, parent_ctx, &local_err);
|
|
|
|
|
|
- if (ret < 0 && child_class->can_set_aio_ctx) {
|
|
|
- GSList *ignore = g_slist_prepend(NULL, new_child);
|
|
|
- if (child_class->can_set_aio_ctx(new_child, child_ctx, &ignore,
|
|
|
- NULL))
|
|
|
- {
|
|
|
+ if (ret < 0 && child_class->change_aio_ctx) {
|
|
|
+ Transaction *tran = tran_new();
|
|
|
+ GHashTable *visited = g_hash_table_new(NULL, NULL);
|
|
|
+ bool ret_child;
|
|
|
+
|
|
|
+ g_hash_table_add(visited, new_child);
|
|
|
+ ret_child = child_class->change_aio_ctx(new_child, child_ctx,
|
|
|
+ visited, tran, NULL);
|
|
|
+ if (ret_child == true) {
|
|
|
error_free(local_err);
|
|
|
ret = 0;
|
|
|
- g_slist_free(ignore);
|
|
|
- ignore = g_slist_prepend(NULL, new_child);
|
|
|
- child_class->set_aio_ctx(new_child, child_ctx, &ignore);
|
|
|
}
|
|
|
- g_slist_free(ignore);
|
|
|
+ tran_finalize(tran, ret_child == true ? 0 : -1);
|
|
|
+ g_hash_table_destroy(visited);
|
|
|
}
|
|
|
|
|
|
if (ret < 0) {
|
|
@@ -7601,7 +7607,7 @@ int bdrv_try_set_aio_context(BlockDriverState *bs, AioContext *ctx,
|
|
|
Error **errp)
|
|
|
{
|
|
|
GLOBAL_STATE_CODE();
|
|
|
- return bdrv_child_try_set_aio_context(bs, ctx, NULL, errp);
|
|
|
+ return bdrv_child_try_change_aio_context(bs, ctx, NULL, errp);
|
|
|
}
|
|
|
|
|
|
void bdrv_add_aio_context_notifier(BlockDriverState *bs,
|