[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/16] qapi/block: Restrict vhost-user-blk to CONFIG_VHOST_USER_BL
From: |
Kevin Wolf |
Subject: |
[PULL 07/16] qapi/block: Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER |
Date: |
Fri, 14 Jan 2022 14:52:17 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
When building QEMU with --disable-vhost-user and using introspection,
query-qmp-schema lists vhost-user-blk even though it's not actually
available:
{ "execute": "query-qmp-schema" }
{
"return": [
...
{
"name": "312",
"members": [
{
"name": "nbd"
},
{
"name": "vhost-user-blk"
}
],
"meta-type": "enum",
"values": [
"nbd",
"vhost-user-blk"
]
},
Restrict vhost-user-blk in BlockExportType when
CONFIG_VHOST_USER_BLK_SERVER is disabled, so it
doesn't end listed by query-qmp-schema.
Fixes: 90fc91d50b7 ("convert vhost-user-blk server to block export API")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220107105420.395011-4-f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qapi/block-export.json | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/qapi/block-export.json b/qapi/block-export.json
index c1b92ce1c1..f9ce79a974 100644
--- a/qapi/block-export.json
+++ b/qapi/block-export.json
@@ -277,7 +277,8 @@
# Since: 4.2
##
{ 'enum': 'BlockExportType',
- 'data': [ 'nbd', 'vhost-user-blk',
+ 'data': [ 'nbd',
+ { 'name': 'vhost-user-blk', 'if': 'CONFIG_VHOST_USER_BLK_SERVER' },
{ 'name': 'fuse', 'if': 'CONFIG_FUSE' } ] }
##
@@ -319,7 +320,8 @@
'discriminator': 'type',
'data': {
'nbd': 'BlockExportOptionsNbd',
- 'vhost-user-blk': 'BlockExportOptionsVhostUserBlk',
+ 'vhost-user-blk': { 'type': 'BlockExportOptionsVhostUserBlk',
+ 'if': 'CONFIG_VHOST_USER_BLK_SERVER' },
'fuse': { 'type': 'BlockExportOptionsFuse',
'if': 'CONFIG_FUSE' }
} }
--
2.31.1
- [PULL 00/16] Block layer patches, Kevin Wolf, 2022/01/14
- [PULL 02/16] include/sysemu/blockdev.h: remove drive_mark_claimed_by_board and inline drive_def, Kevin Wolf, 2022/01/14
- [PULL 01/16] block_int: make bdrv_backing_overridden static, Kevin Wolf, 2022/01/14
- [PULL 04/16] softmmu: fix device deletion events with -device JSON syntax, Kevin Wolf, 2022/01/14
- [PULL 03/16] include/sysemu/blockdev.h: remove drive_get_max_devs, Kevin Wolf, 2022/01/14
- [PULL 06/16] qemu-storage-daemon: Add vhost-user-blk help, Kevin Wolf, 2022/01/14
- [PULL 05/16] docs: Correct 'vhost-user-blk' spelling, Kevin Wolf, 2022/01/14
- [PULL 08/16] block-backend: prevent dangling BDS pointers across aio_poll(), Kevin Wolf, 2022/01/14
- [PULL 07/16] qapi/block: Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER,
Kevin Wolf <=
- [PULL 10/16] iotests/308: Fix for CAP_DAC_OVERRIDE, Kevin Wolf, 2022/01/14
- [PULL 12/16] vvfat: Fix vvfat_write() for writes before the root directory, Kevin Wolf, 2022/01/14
- [PULL 11/16] vvfat: Fix size of temporary qcow file, Kevin Wolf, 2022/01/14
- [PULL 16/16] iotests/testrunner.py: refactor test_field_width, Kevin Wolf, 2022/01/14
- [PULL 09/16] iotests/stream-error-on-reset: New test, Kevin Wolf, 2022/01/14
- [PULL 15/16] block: drop BLK_PERM_GRAPH_MOD, Kevin Wolf, 2022/01/14
- [PULL 13/16] iotests: Test qemu-img convert of zeroed data cluster, Kevin Wolf, 2022/01/14
- [PULL 14/16] qemu-img: make is_allocated_sectors() more efficient, Kevin Wolf, 2022/01/14
- Re: [PULL 00/16] Block layer patches, Peter Maydell, 2022/01/15