diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 09:21:22 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 09:21:23 +0100 |
| commit | e7f5f0b6e6f2fb592ab66145b8bc35a0e4a4e198 (patch) | |
| tree | 10a674def1659d224ff18a56c91f631381faf595 /qapi | |
| parent | 07f426c35eddd79388a23d11cb278600d7e3831d (diff) | |
| parent | fb7afc797e071f2616e1ccc849b39fe43e7033bf (diff) | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-09-26' into staging
nbd patches for 2018-09-26
Fixes for external clients; add reminder to revisit naming of x- command
- Vladimir Sementsov-Ogievskiy: nbd/server: send more than one extent of base:allocation context
- John Snow: qapi: bitmap-merge: document name change
- Vladimir Sementsov-Ogievskiy: nbd/server: fix bitmap export
# gpg: Signature made Thu 27 Sep 2018 03:40:03 BST
# gpg: using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg: aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2018-09-26:
nbd/server: send more than one extent of base:allocation context
qapi: bitmap-merge: document name change
nbd/server: fix bitmap export
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index ac3b48ee54..58ec9931c7 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1935,6 +1935,8 @@ ## # @x-block-dirty-bitmap-merge: # +# FIXME: Rename @src_name and @dst_name to src-name and dst-name. +# # Merge @src_name dirty bitmap to @dst_name dirty bitmap. @src_name dirty # bitmap is unchanged. On error, @dst_name is unchanged. # |