aboutsummaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-01-30 10:00:28 +0000
committerPeter Maydell <peter.maydell@linaro.org>2022-01-30 10:00:28 +0000
commitbfc3db5cf64ab538d6b3c56eab6423372758b258 (patch)
tree9b106dcbaba1ec1213ba747c9996a703429990b6 /qapi
parentd90e6f665d3ac197f83d93ad37147fe677521209 (diff)
parent6384dd534d742123d26c008d9794b20bc41359d5 (diff)
downloadqemu-bfc3db5cf64ab538d6b3c56eab6423372758b258.zip
qemu-bfc3db5cf64ab538d6b3c56eab6423372758b258.tar.gz
qemu-bfc3db5cf64ab538d6b3c56eab6423372758b258.tar.bz2
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2022-01-28' into staging
nbd patches for 2022-01-28 - Hanna Reitz: regression fix for block status caching - Philippe Mathieu-Daude: documentation formatting - Nir Soffer: dead code removal # gpg: Signature made Fri 28 Jan 2022 22:58:50 GMT # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2022-01-28: iotests/block-status-cache: New test block/io: Update BSC only if want_zero is true qapi/block: Cosmetic change in BlockExportType schema nbd/server.c: Remove unused field Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/block-export.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/qapi/block-export.json b/qapi/block-export.json
index f9ce79a..f183522 100644
--- a/qapi/block-export.json
+++ b/qapi/block-export.json
@@ -278,7 +278,8 @@
##
{ 'enum': 'BlockExportType',
'data': [ 'nbd',
- { 'name': 'vhost-user-blk', 'if': 'CONFIG_VHOST_USER_BLK_SERVER' },
+ { 'name': 'vhost-user-blk',
+ 'if': 'CONFIG_VHOST_USER_BLK_SERVER' },
{ 'name': 'fuse', 'if': 'CONFIG_FUSE' } ] }
##