diff options
| author | Peter Maydell | 2016-08-05 14:05:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-05 14:05:29 +0200 |
| commit | bd8eda537fbe6f28a94db30e8facab2bf528b204 (patch) | |
| tree | ffbddd89dfed1d48db6aa51aa093470d084919de /blockdev.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | nvme: bump PCI revision (diff) | |
| download | qemu-bd8eda537fbe6f28a94db30e8facab2bf528b204.tar.gz qemu-bd8eda537fbe6f28a94db30e8facab2bf528b204.tar.xz qemu-bd8eda537fbe6f28a94db30e8facab2bf528b204.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.7.0-rc2
# gpg: Signature made Fri 05 Aug 2016 10:30:12 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
nvme: bump PCI revision
nvme: fix identify to be NVMe 1.1 compliant
block: Accept any target node for transactional blockdev-backup
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/blockdev.c b/blockdev.c index eafeba96d0..21614004d1 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; |