diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 16:58:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 16:58:16 +0100 |
| commit | 50104f5ac537eecc890c65e99362df47bac3f9d9 (patch) | |
| tree | f80ef7933fc3f4e43ccb11f24d7b98a93656e89a /qapi | |
| parent | ce1d20aac8533357650774c2c240e30de87dc122 (diff) | |
| parent | 2c93c5cb43fd992038711f84ea34c9373273cda6 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.10.0-rc0
# gpg: Signature made Mon 24 Jul 2017 15:16:42 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
qemu-iotests: Avoid unnecessary sleeps
block: Skip implicit nodes in query-block/blockstats
qcow2: Fix sector calculation in qcow2_measure()
dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented
iotests: Remove a few tests from 'quick' group
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 6866ae8a38..833c602150 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -520,7 +520,8 @@ # # Get a list of BlockInfo for all virtual block devices. # -# Returns: a list of @BlockInfo describing each virtual block device +# Returns: a list of @BlockInfo describing each virtual block device. Filter +# nodes that were created implicitly are skipped over. # # Since: 0.14.0 # @@ -780,7 +781,8 @@ # information, but not "backing". # If false or omitted, the behavior is as before - query all the # device backends, recursively including their "parent" and -# "backing". (Since 2.3) +# "backing". Filter nodes that were created implicitly are +# skipped over in this mode. (Since 2.3) # # Returns: A list of @BlockStats for each virtual block devices. # |