[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 03/11] block: Accept node-name for blockdev-backu
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v3 03/11] block: Accept node-name for blockdev-backup |
Date: |
Thu, 7 Jul 2016 14:11:29 +0200 |
In order to remove the necessity to use BlockBackend names in the
external API, we want to allow node-names everywhere. This converts
blockdev-backup and the corresponding transaction action to accept a
node-name without lifting the restriction that we're operating at a root
node.
In case of an invalid device name, the command returns the GenericError
error class now instead of DeviceNotFound, because this is what
qmp_get_root_bs() returns.
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 35 ++++++++++-------------------------
qapi/block-core.json | 2 +-
qmp-commands.hx | 2 +-
3 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index e3586f7..d9909d0 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1951,38 +1951,31 @@ static void blockdev_backup_prepare(BlkActionState
*common, Error **errp)
{
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common,
common);
BlockdevBackup *backup;
- BlockBackend *blk, *target;
+ BlockDriverState *bs, *target;
Error *local_err = NULL;
assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);
backup = common->action->u.blockdev_backup.data;
- blk = blk_by_name(backup->device);
- if (!blk) {
- error_setg(errp, "Device '%s' not found", backup->device);
- return;
- }
-
- if (!blk_is_available(blk)) {
- error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, backup->device);
+ bs = qmp_get_root_bs(backup->device, errp);
+ if (!bs) {
return;
}
- target = blk_by_name(backup->target);
+ target = qmp_get_root_bs(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)) {
+ state->aio_context = bdrv_get_aio_context(bs);
+ 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;
}
aio_context_acquire(state->aio_context);
- state->bs = blk_bs(blk);
+ state->bs = bs;
bdrv_drained_begin(state->bs);
do_blockdev_backup(backup->device, backup->target,
@@ -3355,7 +3348,6 @@ void do_blockdev_backup(const char *device, const char
*target,
BlockdevOnError on_target_error,
BlockJobTxn *txn, Error **errp)
{
- BlockBackend *blk;
BlockDriverState *bs;
BlockDriverState *target_bs;
Error *local_err = NULL;
@@ -3371,21 +3363,14 @@ void do_blockdev_backup(const char *device, const char
*target,
on_target_error = BLOCKDEV_ON_ERROR_REPORT;
}
- blk = blk_by_name(device);
- if (!blk) {
- error_setg(errp, "Device '%s' not found", device);
+ bs = qmp_get_root_bs(device, errp);
+ if (!bs) {
return;
}
- aio_context = blk_get_aio_context(blk);
+ aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context);
- if (!blk_is_available(blk)) {
- error_setg(errp, "Device '%s' has no medium", device);
- goto out;
- }
- bs = blk_bs(blk);
-
target_bs = bdrv_lookup_bs(target, target, errp);
if (!target_bs) {
goto out;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 6baf6cc..98bbd49 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -912,7 +912,7 @@
##
# @BlockdevBackup
#
-# @device: the name of the device which should be copied.
+# @device: the device name or node-name of a root node which should be copied.
#
# @target: the name of the backup target device.
#
diff --git a/qmp-commands.hx b/qmp-commands.hx
index c6df92c..e24d573 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1280,7 +1280,7 @@ as backup target.
Arguments:
-- "device": the name of the device which should be copied.
+- "device": the device name or node-name of a root node which should be copied.
(json-string)
- "target": the name of the backup target device. (json-string)
- "sync": what parts of the disk image should be copied to the destination;
--
1.8.3.1
- Re: [Qemu-block] [PATCH v3 01/11] block: Accept node-name for block-stream, (continued)
Re: [Qemu-block] [PATCH v3 01/11] block: Accept node-name for block-stream, Eric Blake, 2016/07/07
[Qemu-block] [PATCH v3 02/11] block: Accept node-name for block-commit, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 03/11] block: Accept node-name for blockdev-backup,
Kevin Wolf <=
[Qemu-block] [PATCH v3 04/11] block: Accept node-name for blockdev-mirror, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 05/11] block: Accept node-name for blockdev-snapshot-delete-internal-sync, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 06/11] block: Accept node-name for blockdev-snapshot-internal-sync, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 07/11] block: Accept node-name for change-backing-file, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 08/11] block: Accept node-name for drive-backup, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 09/11] block: Accept node-name for drive-mirror, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 10/11] nbd-server: Use a separate BlockBackend, Kevin Wolf, 2016/07/07
[Qemu-block] [PATCH v3 11/11] nbd-server: Allow node name for nbd-server-add, Kevin Wolf, 2016/07/07