Add target-id (optional) to drive-backup command, to make the target bs
a named drive so that we can operate on it (e.g. export with NBD).
Signed-off-by: Fam Zheng <f...@redhat.com>
---
blockdev.c | 4 +++-
qapi-schema.json | 7 +++++--
qmp-commands.hx | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index d02d99a..a297eaf 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -936,6 +936,7 @@ static void drive_backup_prepare(BlkTransactionState
*common, Error **errp)
backup = common->action->drive_backup;
qmp_drive_backup(backup->device, backup->target,
+ backup->has_target_id, backup->target_id,
backup->has_format, backup->format,
backup->has_mode, backup->mode,
backup->has_speed, backup->speed,
@@ -1421,6 +1422,7 @@ void qmp_block_commit(const char *device,
}
void qmp_drive_backup(const char *device, const char *target,
+ bool has_target_id, const char *target_id,
bool has_format, const char *format,
bool has_mode, enum NewImageMode mode,
bool has_speed, int64_t speed,
@@ -1495,7 +1497,7 @@ void qmp_drive_backup(const char *device, const char
*target,
return;
}
- target_bs = bdrv_new("");
+ target_bs = bdrv_new(has_target_id ? target_id : "");
ret = bdrv_open(target_bs, target, NULL, flags, drv);
if (ret < 0) {
bdrv_delete(target_bs);
diff --git a/qapi-schema.json b/qapi-schema.json
index 5c32528..2f2a87f 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1654,7 +1654,8 @@
# Since: 1.6
##
{ 'type': 'DriveBackup',
- 'data': { 'device': 'str', 'target': 'str', '*format': 'str',
+ 'data': { 'device': 'str', 'target': 'str',
+ '*target-id': 'str', '*format': 'str',
'*mode': 'NewImageMode', '*speed': 'int',
'*on-source-error': 'BlockdevOnError',
'*on-target-error': 'BlockdevOnError' } }
@@ -1807,6 +1808,7 @@
# is a device, the existing file/device will be used as the new
# destination. If it does not exist, a new file will be created.
#
+# @target-id: #optional the drive id of the target.
# @format: #optional the format of the new destination, default is to
# probe if @mode is 'existing', else the format of the source
#
@@ -1833,7 +1835,8 @@
# Since 1.6
##
{ 'command': 'drive-backup',
- 'data': { 'device': 'str', 'target': 'str', '*format': 'str',
+ 'data': { 'device': 'str', 'target': 'str',
+ '*target-id': 'str', '*format': 'str',
'*mode': 'NewImageMode', '*speed': 'int',
'*on-source-error': 'BlockdevOnError',
'*on-target-error': 'BlockdevOnError' } }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 362f0e1..3ed03de 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -913,7 +913,7 @@ EQMP
{
.name = "drive-backup",
- .args_type = "device:B,target:s,speed:i?,mode:s?,format:s?,"
+ .args_type =
"device:B,target:s,target-id:s?,speed:i?,mode:s?,format:s?,"
"on-source-error:s?,on-target-error:s?",
.mhandler.cmd_new = qmp_marshal_input_drive_backup,
},
@@ -936,6 +936,7 @@ Arguments:
device, the existing file/device will be used as the new
destination. If it does not exist, a new file will be created.
(json-string)
+- "target-id": the drive id of the target image.
- "format": the format of the new destination, default is to probe if 'mode' is
'existing', else the format of the source
(json-string, optional)
--
1.8.3.1
