diff options
| -rw-r--r-- | docs/qmp-commands.txt | 39 | ||||
| -rw-r--r-- | qapi/block-core.json | 10 |
2 files changed, 10 insertions, 39 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt index e23ac6b8d8..7cd7bc03e9 100644 --- a/docs/qmp-commands.txt +++ b/docs/qmp-commands.txt @@ -169,45 +169,6 @@ Example: <- { "return": { "status": "active", "completed": 1024000, "total": 2048000 } } -block-stream ------------- - -Copy data from a backing file into a block device. - -Arguments: - -- "job-id": Identifier for the newly-created block job. If omitted, - the device name will be used. (json-string, optional) -- "device": The device name or node-name of a root node (json-string) -- "base": The file name of the backing image above which copying starts. - It cannot be set if 'base-node' is also set (json-string, optional) -- "base-node": the node name of the backing image above which copying starts. - It cannot be set if 'base' is also set. - (json-string, optional) (Since 2.8) -- "backing-file": The backing file string to write into the active layer. This - filename is not validated. - - If a pathname string is such that it cannot be resolved by - QEMU, that means that subsequent QMP or HMP commands must use - node-names for the image in question, as filename lookup - methods will fail. - - If not specified, QEMU will automatically determine the - backing file string to use, or error out if there is no - obvious choice. Care should be taken when specifying the - string, to specify a valid filename or protocol. - (json-string, optional) (Since 2.1) -- "speed": the maximum speed, in bytes per second (json-int, optional) -- "on-error": the action to take on an error (default 'report'). 'stop' and - 'enospc' can only be used if the block device supports io-status. - (json-string, optional) (Since 2.1) - -Example: - --> { "execute": "block-stream", "arguments": { "device": "virtio0", - "base": "/tmp/master.qcow2" } } -<- { "return": {} } - blockdev-snapshot-internal-sync ------------------------------- diff --git a/qapi/block-core.json b/qapi/block-core.json index f6e6667361..fba32219e3 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1883,7 +1883,17 @@ # 'stop' and 'enospc' can only be used if the block device # supports io-status (see BlockInfo). Since 1.3. # +# Returns: Nothing on success. If @device does not exist, DeviceNotFound. +# # Since: 1.1 +# +# Example: +# +# -> { "execute": "block-stream", +# "arguments": { "device": "virtio0", +# "base": "/tmp/master.qcow2" } } +# <- { "return": {} } +# ## { 'command': 'block-stream', 'data': { '*job-id': 'str', 'device': 'str', '*base': 'str', |