Patchwork [V3,5/9] qmp: add interface blockdev-snapshot-internal-sync

login
register
mail settings
Submitter Wayne Xia
Date June 27, 2013, 2:41 a.m.
Message ID <1372300908-7546-6-git-send-email-xiawenc@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/254560/
State New
Headers show

Comments

Wayne Xia - June 27, 2013, 2:41 a.m.
Snapshot ID can't be specified in this interface.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
 blockdev.c       |   13 +++++++++++++
 qapi-schema.json |   22 ++++++++++++++++++++++
 qmp-commands.hx  |   30 ++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 0 deletions(-)
Stefan Hajnoczi - July 4, 2013, 12:37 p.m.
On Thu, Jun 27, 2013 at 10:41:44AM +0800, Wenchao Xia wrote:
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 2547a7d..fba9b15 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -1738,6 +1738,28 @@
>              '*mode': 'NewImageMode'} }
>  
>  ##
> +# @blockdev-snapshot-internal-sync
> +#
> +# Synchronously take an internal snapshot of a block device, when the format
> +# of the image used supports it.
> +#
> +# @device: the name of the device to generate the snapshot from
> +#
> +# @name: the name of new snapshot name
> +#
> +# Returns: nothing on success
> +#          If @device is not a valid block device, DeviceNotFound
> +#          If any snapshot matching @name exists, or the name string is invalid
> +#          which may mess up with snapshot ID, or name is empty, GenericError

s/mess up with snapshot ID/collide with snapshot IDs/

> +image used supports it.  If the name is a numeric string which may mess up with

Same here.

Patch

diff --git a/blockdev.c b/blockdev.c
index c3b607d..ce89f83 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -777,6 +777,19 @@  void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file,
                        &snapshot, errp);
 }
 
+void qmp_blockdev_snapshot_internal_sync(const char *device,
+                                         const char *name,
+                                         Error **errp)
+{
+    BlockdevSnapshotInternal snapshot = {
+        .device = (char *) device,
+        .name = (char *) name
+    };
+
+    blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_INTERNAL_SYNC,
+                       &snapshot, errp);
+}
+
 
 /* New and old BlockDriverState structs for group snapshots */
 
diff --git a/qapi-schema.json b/qapi-schema.json
index 2547a7d..fba9b15 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1738,6 +1738,28 @@ 
             '*mode': 'NewImageMode'} }
 
 ##
+# @blockdev-snapshot-internal-sync
+#
+# Synchronously take an internal snapshot of a block device, when the format
+# of the image used supports it.
+#
+# @device: the name of the device to generate the snapshot from
+#
+# @name: the name of new snapshot name
+#
+# Returns: nothing on success
+#          If @device is not a valid block device, DeviceNotFound
+#          If any snapshot matching @name exists, or the name string is invalid
+#          which may mess up with snapshot ID, or name is empty, GenericError
+#          If the format of the image used does not support it,
+#          BlockFormatFeatureNotSupported
+#
+# Since 1.6
+##
+{ 'command': 'blockdev-snapshot-internal-sync',
+  'data': { 'device': 'str', 'name': 'str'} }
+
+##
 # @human-monitor-command:
 #
 # Execute a command on the human monitor and return the output.
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 27642c0..3df50de 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1091,6 +1091,36 @@  Example:
 EQMP
 
     {
+        .name       = "blockdev-snapshot-internal-sync",
+        .args_type  = "device:B,name:s",
+        .mhandler.cmd_new = qmp_marshal_input_blockdev_snapshot_internal_sync,
+    },
+
+SQMP
+blockdev-snapshot-internal-sync
+-------------------------------
+
+Synchronously take an internal snapshot of a block device when the format of
+image used supports it.  If the name is a numeric string which may mess up with
+ID, such as "19", or an empty string, the operation will fail.  If a snapshot
+with name already exists, the operation will fail.
+
+Arguments:
+
+- "device": device name to snapshot (json-string)
+- "name": name of the new snapshot (json-string)
+
+Example:
+
+-> { "execute": "blockdev-snapshot-internal-sync",
+                "arguments": { "device": "ide-hd0",
+                               "name": "snapshot0" }
+   }
+<- { "return": {} }
+
+EQMP
+
+    {
         .name       = "drive-mirror",
         .args_type  = "sync:s,device:B,target:s,speed:i?,mode:s?,format:s?,"
                       "on-source-error:s?,on-target-error:s?,"