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

blockdev: Use bdrv_try_set_aio_context() for monitor commands

Browse Source 
Monitor commands can handle errors, so they can easily be converted to
using the safer bdrv_try_set_aio_context() function.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2019-04-26 16:12:27 +02:00
parent ad943dcb22
commit 8ed7d42fb5
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
blockdev.c
View File

@ -1535,6 +1535,7 @@ static void external_snapshot_prepare(BlkActionState *common,
DO_UPCAST(ExternalSnapshotState, common, common); DO_UPCAST(ExternalSnapshotState, common, common);
TransactionAction *action = common->action; TransactionAction *action = common->action;
AioContext *aio_context; AioContext *aio_context;
int ret;
/* 'blockdev-snapshot' and 'blockdev-snapshot-sync' have similar /* 'blockdev-snapshot' and 'blockdev-snapshot-sync' have similar
* purpose but a different set of parameters */ * purpose but a different set of parameters */
@ -1674,7 +1675,10 @@ static void external_snapshot_prepare(BlkActionState *common,
goto out; goto out;
} }
bdrv_set_aio_context(state->new_bs, aio_context); ret = bdrv_try_set_aio_context(state->new_bs, aio_context, errp);
if (ret < 0) {
goto out;
}
/* This removes our old bs and adds the new bs. This is an operation that /* This removes our old bs and adds the new bs. This is an operation that
* can fail, so we need to do it in .prepare; undoing it for abort is * can fail, so we need to do it in .prepare; undoing it for abort is
@ -3440,6 +3444,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,
int flags, job_flags = JOB_DEFAULT; int flags, job_flags = JOB_DEFAULT;
int64_t size; int64_t size;
bool set_backing_hd = false; bool set_backing_hd = false;
int ret;
if (!backup->has_speed) { if (!backup->has_speed) {
backup->speed = 0; backup->speed = 0;
@ -3541,7 +3546,11 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,
goto out; goto out;
} }
bdrv_set_aio_context(target_bs, aio_context); ret = bdrv_try_set_aio_context(target_bs, aio_context, errp);
if (ret < 0) {
bdrv_unref(target_bs);
goto out;
}
if (set_backing_hd) { if (set_backing_hd) {
bdrv_set_backing_hd(target_bs, source, &local_err); bdrv_set_backing_hd(target_bs, source, &local_err);
@ -3613,6 +3622,7 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, JobTxn *txn,
AioContext *aio_context; AioContext *aio_context;
BlockJob *job = NULL; BlockJob *job = NULL;
int job_flags = JOB_DEFAULT; int job_flags = JOB_DEFAULT;
int ret;
if (!backup->has_speed) { if (!backup->has_speed) {
backup->speed = 0; backup->speed = 0;
@ -3649,16 +3659,9 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, JobTxn *txn,
goto out; goto out;
} }
if (bdrv_get_aio_context(target_bs) != aio_context) { ret = bdrv_try_set_aio_context(target_bs, aio_context, errp);
if (!bdrv_has_blk(target_bs)) { if (ret < 0) {
/* The target BDS is not attached, we can safely move it to another goto out;
* AioContext. */
bdrv_set_aio_context(target_bs, aio_context);
} else {
error_setg(errp, "Target is attached to a different thread from "
"source.");
goto out;
}
} }
if (backup->has_bitmap) { if (backup->has_bitmap) {
@ -3831,6 +3834,7 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
int flags; int flags;
int64_t size; int64_t size;
const char *format = arg->format; const char *format = arg->format;
int ret;
bs = qmp_get_root_bs(arg->device, errp); bs = qmp_get_root_bs(arg->device, errp);
if (!bs) { if (!bs) {
@ -3931,7 +3935,11 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
goto out; goto out;
} }
bdrv_set_aio_context(target_bs, aio_context); ret = bdrv_try_set_aio_context(target_bs, aio_context, errp);
if (ret < 0) {
bdrv_unref(target_bs);
goto out;
}
blockdev_mirror_common(arg->has_job_id ? arg->job_id : NULL, bs, target_bs, blockdev_mirror_common(arg->has_job_id ? arg->job_id : NULL, bs, target_bs,
arg->has_replaces, arg->replaces, arg->sync, arg->has_replaces, arg->replaces, arg->sync,
@ -3975,6 +3983,7 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
AioContext *aio_context; AioContext *aio_context;
BlockMirrorBackingMode backing_mode = MIRROR_LEAVE_BACKING_CHAIN; BlockMirrorBackingMode backing_mode = MIRROR_LEAVE_BACKING_CHAIN;
Error *local_err = NULL; Error *local_err = NULL;
int ret;
bs = qmp_get_root_bs(device, errp); bs = qmp_get_root_bs(device, errp);
if (!bs) { if (!bs) {
@ -3989,7 +3998,10 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
aio_context = bdrv_get_aio_context(bs); aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context); aio_context_acquire(aio_context);
bdrv_set_aio_context(target_bs, aio_context); ret = bdrv_try_set_aio_context(target_bs, aio_context, errp);
if (ret < 0) {
goto out;
}
blockdev_mirror_common(has_job_id ? job_id : NULL, bs, target_bs, blockdev_mirror_common(has_job_id ? job_id : NULL, bs, target_bs,
has_replaces, replaces, sync, backing_mode, has_replaces, replaces, sync, backing_mode,
@ -4005,7 +4017,7 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
has_auto_dismiss, auto_dismiss, has_auto_dismiss, auto_dismiss,
&local_err); &local_err);
error_propagate(errp, local_err); error_propagate(errp, local_err);
out:
aio_context_release(aio_context); aio_context_release(aio_context);
} }
@ -4495,7 +4507,7 @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,
old_context = bdrv_get_aio_context(bs); old_context = bdrv_get_aio_context(bs);
aio_context_acquire(old_context); aio_context_acquire(old_context);
bdrv_set_aio_context(bs, new_context); bdrv_try_set_aio_context(bs, new_context, errp);
aio_context_release(old_context); aio_context_release(old_context);
} }