Commit a911e6ae authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

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: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a39a24fb

blockdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

qapi-schema.json

+1 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ 
##

{ 'union': 'TransactionAction',

  'data': {

       'blockdev-snapshot-sync': 'BlockdevSnapshot',

       'blockdev-snapshot-sync': 'BlockdevSnapshotSync',

       'drive-backup': 'DriveBackup',

       'blockdev-backup': 'BlockdevBackup',

       'abort': 'Abort',

qapi/block-core.json

+4 −4
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ 
  'data': [ 'existing', 'absolute-paths' ] }



##

# @BlockdevSnapshot

# @BlockdevSnapshotSync

#

# Either @device or @node-name must be set but not both.

#
@@ -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' } }
@@ -790,7 +790,7 @@ 
#

# 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
@@ -798,7 +798,7 @@ 
# Since 0.14.0

##

{ 'command': 'blockdev-snapshot-sync',

  'data': 'BlockdevSnapshot' }

  'data': 'BlockdevSnapshotSync' }



##

# @change-backing-file