summaryrefslogtreecommitdiffstats
path: root/block/export
diff options
context:
space:
mode:
authorStefan Hajnoczi2021-03-09 10:41:03 +0100
committerKevin Wolf2021-03-19 10:15:06 +0100
commit6f4b1996b4cdc6b745bebae737c250f08c1ad965 (patch)
treee70fa286ece804e6997845d8d949dde6f20d0fde /block/export
parentcurl: Disconnect sockets from CURLState (diff)
downloadqemu-6f4b1996b4cdc6b745bebae737c250f08c1ad965.tar.gz
qemu-6f4b1996b4cdc6b745bebae737c250f08c1ad965.tar.xz
qemu-6f4b1996b4cdc6b745bebae737c250f08c1ad965.zip
block/export: disable VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD for now
The vhost-user in-flight shmfd feature has not been tested with qemu-storage-daemon's vhost-user-blk server. Disable this optional feature for now because it requires MFD_ALLOW_SEALING, which is not available in some CI environments. If we need this feature in the future it can be re-enabled after testing. Reported-by: Peter Maydell <peter.maydell@linaro.org> Cc: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20210309094106.196911-2-stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/export')
-rw-r--r--block/export/vhost-user-blk-server.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c
index cb5d896b7b..fa06996d37 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -345,8 +345,7 @@ static uint64_t vu_blk_get_features(VuDev *dev)
static uint64_t vu_blk_get_protocol_features(VuDev *dev)
{
- return 1ull << VHOST_USER_PROTOCOL_F_CONFIG |
- 1ull << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD;
+ return 1ull << VHOST_USER_PROTOCOL_F_CONFIG;
}
static int