summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 14:04:28 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:19:45 +0100
commitb4039d8d23a6729c0206b3b3b14a9cd0bd618b69 (patch)
tree285ffd6a2cabf64d3142090c2c90305fc3073d6d
parent0dc869cf709368265bb5b7a5fe35b7e3b53a776e (diff)
downloadfocaccia-qemu-b4039d8d23a6729c0206b3b3b14a9cd0bd618b69.tar.gz
focaccia-qemu-b4039d8d23a6729c0206b3b3b14a9cd0bd618b69.zip
qmp-commands: move 'blockdev-snapshot-sync' doc to schema
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--docs/qmp-commands.txt27
-rw-r--r--qapi/block-core.json14
2 files changed, 13 insertions, 28 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 5302c80165..c857d39c46 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -402,33 +402,6 @@ Example:
                                                            "name": "bitmap0" } }
 <- { "return": {} }
 
-blockdev-snapshot-sync
-----------------------
-
-Synchronous snapshot of a block device. snapshot-file specifies the
-target of the new image. If the file exists, or if it is a device, the
-snapshot will be created in the existing file/device. If does not
-exist, a new file will be created. format specifies the format of the
-snapshot image, default is qcow2.
-
-Arguments:
-
-- "device": device name to snapshot (json-string)
-- "node-name": graph node name to snapshot (json-string)
-- "snapshot-file": name of new image file (json-string)
-- "snapshot-node-name": graph node name of the new snapshot (json-string)
-- "mode": whether and how QEMU should create the snapshot file
-  (NewImageMode, optional, default "absolute-paths")
-- "format": format of new image (json-string, optional)
-
-Example:
-
--> { "execute": "blockdev-snapshot-sync", "arguments": { "device": "ide-hd0",
-                                                         "snapshot-file":
-                                                        "/some/place/my-image",
-                                                        "format": "qcow2" } }
-<- { "return": {} }
-
 blockdev-snapshot
 -----------------
 Since 2.5
diff --git a/qapi/block-core.json b/qapi/block-core.json
index d1bc2e5901..884831943b 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1037,7 +1037,9 @@
 #
 # @node-name: #optional graph node name to generate the snapshot from (Since 2.0)
 #
-# @snapshot-file: the target of the new image. A new file will be created.
+# @snapshot-file: the target of the new image. If the file exists, or
+# if it is a device, the snapshot will be created in the existing
+# file/device. Otherwise, a new file will be created.
 #
 # @snapshot-node-name: #optional the graph node name of the new image (Since 2.0)
 #
@@ -1171,6 +1173,16 @@
 #          If @device is not a valid block device, DeviceNotFound
 #
 # Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "blockdev-snapshot-sync",
+#      "arguments": { "device": "ide-hd0",
+#                     "snapshot-file":
+#                     "/some/place/my-image",
+#                     "format": "qcow2" } }
+# <- { "return": {} }
+#
 ##
 { 'command': 'blockdev-snapshot-sync',
   'data': 'BlockdevSnapshotSync' }