Skip to content

Commit

Permalink
block: rename BlockdevSnapshot to BlockdevSnapshotSync
Browse files Browse the repository at this point in the history
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: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
bertogg authored and kevmw committed Nov 11, 2015
1 parent a39a24f commit a911e6a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion blockdev.c
Expand Up @@ -1168,7 +1168,7 @@ void qmp_blockdev_snapshot_sync(bool has_device, const char *device,
bool has_format, const char *format,
bool has_mode, NewImageMode mode, Error **errp)
{
BlockdevSnapshot snapshot = {
BlockdevSnapshotSync snapshot = {
.has_device = has_device,
.device = (char *) device,
.has_node_name = has_node_name,
Expand Down
2 changes: 1 addition & 1 deletion qapi-schema.json
Expand Up @@ -1548,7 +1548,7 @@
##
{ 'union': 'TransactionAction',
'data': {
'blockdev-snapshot-sync': 'BlockdevSnapshot',
'blockdev-snapshot-sync': 'BlockdevSnapshotSync',
'drive-backup': 'DriveBackup',
'blockdev-backup': 'BlockdevBackup',
'abort': 'Abort',
Expand Down
8 changes: 4 additions & 4 deletions qapi/block-core.json
Expand Up @@ -682,7 +682,7 @@
'data': [ 'existing', 'absolute-paths' ] }

##
# @BlockdevSnapshot
# @BlockdevSnapshotSync
#
# Either @device or @node-name must be set but not both.
#
Expand All @@ -699,7 +699,7 @@
# @mode: #optional whether and how QEMU should create a new image, default is
# 'absolute-paths'.
##
{ 'struct': 'BlockdevSnapshot',
{ 'struct': 'BlockdevSnapshotSync',
'data': { '*device': 'str', '*node-name': 'str',
'snapshot-file': 'str', '*snapshot-node-name': 'str',
'*format': 'str', '*mode': 'NewImageMode' } }
Expand Down Expand Up @@ -790,15 +790,15 @@
#
# 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
# If @device is not a valid block device, DeviceNotFound
#
# Since 0.14.0
##
{ 'command': 'blockdev-snapshot-sync',
'data': 'BlockdevSnapshot' }
'data': 'BlockdevSnapshotSync' }

##
# @change-backing-file
Expand Down

0 comments on commit a911e6a

Please sign in to comment.