OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: don't keep AioContext acquired after blockdev_backup_prepare() 

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20171206144550.22295-5-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2017-12-06 14:45:45 +00:00
parent 66d56054bc
commit edd5adeecd
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
blockdev.c
View File

@ -1936,7 +1936,6 @@ typedef struct BlockdevBackupState {
BlkActionState common; BlkActionState common;
BlockDriverState *bs; BlockDriverState *bs;
BlockJob *job; BlockJob *job;
AioContext *aio_context;
} BlockdevBackupState; } BlockdevBackupState;
static BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn, static BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,
@ -1947,6 +1946,7 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp)
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common); BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);
BlockdevBackup *backup; BlockdevBackup *backup;
BlockDriverState *bs, *target; BlockDriverState *bs, *target;
AioContext *aio_context;
Error *local_err = NULL; Error *local_err = NULL;
assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP); assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);
@ -1962,29 +1962,39 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp)
return; return;
} }
/* AioContext is released in .clean() */ aio_context = bdrv_get_aio_context(bs);
state->aio_context = bdrv_get_aio_context(bs); if (aio_context != bdrv_get_aio_context(target)) {
if (state->aio_context != bdrv_get_aio_context(target)) {
state->aio_context = NULL;
error_setg(errp, "Backup between two IO threads is not implemented"); error_setg(errp, "Backup between two IO threads is not implemented");
return; return;
} }
aio_context_acquire(state->aio_context); aio_context_acquire(aio_context);
state->bs = bs; state->bs = bs;
/* Paired with .clean() */
bdrv_drained_begin(state->bs); bdrv_drained_begin(state->bs);
state->job = do_blockdev_backup(backup, common->block_job_txn, &local_err); state->job = do_blockdev_backup(backup, common->block_job_txn, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; goto out;
} }
out:
aio_context_release(aio_context);
} }
static void blockdev_backup_commit(BlkActionState *common) static void blockdev_backup_commit(BlkActionState *common)
{ {
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common); BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);
AioContext *aio_context;
aio_context = bdrv_get_aio_context(state->bs);
aio_context_acquire(aio_context);
assert(state->job); assert(state->job);
block_job_start(state->job); block_job_start(state->job);
aio_context_release(aio_context);
} }
static void blockdev_backup_abort(BlkActionState *common) static void blockdev_backup_abort(BlkActionState *common)
@ -1992,18 +2002,32 @@ static void blockdev_backup_abort(BlkActionState *common)
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common); BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);
if (state->job) { if (state->job) {
AioContext *aio_context;
aio_context = bdrv_get_aio_context(state->bs);
aio_context_acquire(aio_context);
block_job_cancel_sync(state->job); block_job_cancel_sync(state->job);
aio_context_release(aio_context);
} }
} }
static void blockdev_backup_clean(BlkActionState *common) static void blockdev_backup_clean(BlkActionState *common)
{ {
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common); BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);
AioContext *aio_context;
if (state->aio_context) { if (!state->bs) {
bdrv_drained_end(state->bs); return;
aio_context_release(state->aio_context);
} }
aio_context = bdrv_get_aio_context(state->bs);
aio_context_acquire(aio_context);
bdrv_drained_end(state->bs);
aio_context_release(aio_context);
} }
typedef struct BlockDirtyBitmapState { typedef struct BlockDirtyBitmapState {