提交 a911e6ae 编写于 作者: A Alberto Garcia 提交者: Kevin Wolf

block: rename BlockdevSnapshot to BlockdevSnapshotSync

We will introduce the 'blockdev-snapshot' command that will require
its own struct for the parameters, so we need to rename this one in
order to avoid name clashes.
Signed-off-by: NAlberto Garcia <berto@igalia.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Reviewed-by: NMax Reitz <mreitz@redhat.com>
Reviewed-by: NKevin Wolf <kwolf@redhat.com>
Reviewed-by: NJeff Cody <jcody@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 a39a24fb
...@@ -1168,7 +1168,7 @@ void qmp_blockdev_snapshot_sync(bool has_device, const char *device, ...@@ -1168,7 +1168,7 @@ void qmp_blockdev_snapshot_sync(bool has_device, const char *device,
bool has_format, const char *format, bool has_format, const char *format,
bool has_mode, NewImageMode mode, Error **errp) bool has_mode, NewImageMode mode, Error **errp)
{ {
BlockdevSnapshot snapshot = { BlockdevSnapshotSync snapshot = {
.has_device = has_device, .has_device = has_device,
.device = (char *) device, .device = (char *) device,
.has_node_name = has_node_name, .has_node_name = has_node_name,
......
...@@ -1548,7 +1548,7 @@ ...@@ -1548,7 +1548,7 @@
## ##
{ 'union': 'TransactionAction', { 'union': 'TransactionAction',
'data': { 'data': {
'blockdev-snapshot-sync': 'BlockdevSnapshot', 'blockdev-snapshot-sync': 'BlockdevSnapshotSync',
'drive-backup': 'DriveBackup', 'drive-backup': 'DriveBackup',
'blockdev-backup': 'BlockdevBackup', 'blockdev-backup': 'BlockdevBackup',
'abort': 'Abort', 'abort': 'Abort',
......
...@@ -682,7 +682,7 @@ ...@@ -682,7 +682,7 @@
'data': [ 'existing', 'absolute-paths' ] } 'data': [ 'existing', 'absolute-paths' ] }
## ##
# @BlockdevSnapshot # @BlockdevSnapshotSync
# #
# Either @device or @node-name must be set but not both. # Either @device or @node-name must be set but not both.
# #
...@@ -699,7 +699,7 @@ ...@@ -699,7 +699,7 @@
# @mode: #optional whether and how QEMU should create a new image, default is # @mode: #optional whether and how QEMU should create a new image, default is
# 'absolute-paths'. # 'absolute-paths'.
## ##
{ 'struct': 'BlockdevSnapshot', { 'struct': 'BlockdevSnapshotSync',
'data': { '*device': 'str', '*node-name': 'str', 'data': { '*device': 'str', '*node-name': 'str',
'snapshot-file': 'str', '*snapshot-node-name': 'str', 'snapshot-file': 'str', '*snapshot-node-name': 'str',
'*format': 'str', '*mode': 'NewImageMode' } } '*format': 'str', '*mode': 'NewImageMode' } }
...@@ -790,7 +790,7 @@ ...@@ -790,7 +790,7 @@
# #
# Generates a synchronous snapshot of a block device. # Generates a synchronous snapshot of a block device.
# #
# For the arguments, see the documentation of BlockdevSnapshot. # For the arguments, see the documentation of BlockdevSnapshotSync.
# #
# Returns: nothing on success # Returns: nothing on success
# If @device is not a valid block device, DeviceNotFound # If @device is not a valid block device, DeviceNotFound
...@@ -798,7 +798,7 @@ ...@@ -798,7 +798,7 @@
# Since 0.14.0 # Since 0.14.0
## ##
{ 'command': 'blockdev-snapshot-sync', { 'command': 'blockdev-snapshot-sync',
'data': 'BlockdevSnapshot' } 'data': 'BlockdevSnapshotSync' }
## ##
# @change-backing-file # @change-backing-file
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册