From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm8Lj-0006qY-Pk for qemu-devel@nongnu.org; Tue, 13 Oct 2015 18:47:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zm8Li-0002vu-Il for qemu-devel@nongnu.org; Tue, 13 Oct 2015 18:47:15 -0400 Date: Tue, 13 Oct 2015 18:47:07 -0400 From: Jeff Cody Message-ID: <20151013224707.GP11943@localhost.localdomain> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [Qemu-block] [PATCH v7 2/5] block: rename BlockdevSnapshot to BlockdevSnapshotSync List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alberto Garcia Cc: Kevin Wolf , Stefan Hajnoczi , qemu-devel@nongnu.org, qemu-block@nongnu.org, Max Reitz On Mon, Oct 12, 2015 at 12:16:14PM +0300, Alberto Garcia wrote: > 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 > Reviewed-by: Eric Blake > Reviewed-by: Max Reitz > Reviewed-by: Kevin Wolf > --- > blockdev.c | 2 +- > qapi-schema.json | 2 +- > qapi/block-core.json | 8 ++++---- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index 0898d1f..12741a0 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1166,7 +1166,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, > diff --git a/qapi-schema.json b/qapi-schema.json > index a05794e..65701dc 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1534,7 +1534,7 @@ > ## > { 'union': 'TransactionAction', > 'data': { > - 'blockdev-snapshot-sync': 'BlockdevSnapshot', > + 'blockdev-snapshot-sync': 'BlockdevSnapshotSync', > 'drive-backup': 'DriveBackup', > 'blockdev-backup': 'BlockdevBackup', > 'abort': 'Abort', > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 5f12af7..6b5ac02 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -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 > -- > 2.6.1 > > Reviewed-by: Jeff Cody