aboutsummaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-08-02 19:22:04 +0200
committerKevin Wolf <kwolf@redhat.com>2016-08-05 10:55:14 +0200
commit39d990ac384cba496ba1f8bade184f182f9d5ad3 (patch)
tree71b61266335eda54493260297ff95be460044e18 /blockdev.c
parent42e0d60f1615ef63d16e41bb1668805560c37870 (diff)
downloadqemu-39d990ac384cba496ba1f8bade184f182f9d5ad3.zip
qemu-39d990ac384cba496ba1f8bade184f182f9d5ad3.tar.gz
qemu-39d990ac384cba496ba1f8bade184f182f9d5ad3.tar.bz2
block: Accept any target node for transactional blockdev-backup
Commit 0d978913 changed blockdev-backup to accept arbitrary node names instead of device names (i.e. root nodes) for the backup target. However, it forgot to make the same change in transactions and to update the documentation. This patch fixes these omissions. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/blockdev.c b/blockdev.c
index eafeba9..2161400 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1937,7 +1937,8 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp)
{
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);
BlockdevBackup *backup;
- BlockBackend *blk, *target;
+ BlockBackend *blk;
+ BlockDriverState *target;
Error *local_err = NULL;
assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);
@@ -1954,15 +1955,14 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp)
return;
}
- target = blk_by_name(backup->target);
+ target = bdrv_lookup_bs(backup->target, backup->target, errp);
if (!target) {
- error_setg(errp, "Device '%s' not found", backup->target);
return;
}
/* AioContext is released in .clean() */
state->aio_context = blk_get_aio_context(blk);
- if (state->aio_context != blk_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");
return;