8360fa3a32
- Fix CVE-2021-3527 in usb/redir: usb-redir-avoid-dynamic-stack-allocation.patch - Fix issues found upstream: hw-block-nvme-consider-metadata-read-aio.patch sockets-update-SOCKET_ADDRESS_TYPE_FD-li.patch vfio-ccw-Permit-missing-IRQs.patch vhost-user-blk-Check-that-num-queues-is-.patch vhost-user-blk-Don-t-reconnect-during-in.patch vhost-user-blk-Fail-gracefully-on-too-la.patch vhost-user-blk-Get-more-feature-flags-fr.patch vhost-user-blk-Make-sure-to-set-Error-on.patch virtio-blk-Fix-rollback-path-in-virtio_b.patch virtio-Fail-if-iommu_platform-is-request.patch virtiofsd-Fix-side-effect-in-assert.patch monitor-qmp-fix-race-on-CHR_EVENT_CLOSED.patch OBS-URL: https://build.opensuse.org/request/show/895224 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=650
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Thu, 29 Apr 2021 19:13:14 +0200
|
|
Subject: vhost-user-blk: Get more feature flags from vhost device
|
|
|
|
Git-commit: 7556a320c98812ca6648b707393f4513387faf73
|
|
|
|
VIRTIO_F_RING_PACKED and VIRTIO_F_IOMMU_PLATFORM need to be supported by
|
|
the vhost device, otherwise advertising it to the guest doesn't result
|
|
in a working configuration. They are currently not supported by the
|
|
vhost-user-blk export in QEMU.
|
|
|
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1935020
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Acked-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
|
|
Message-Id: <20210429171316.162022-5-kwolf@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
|
|
---
|
|
hw/block/vhost-user-blk.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
|
|
index c0b9958da1b4e155e063fb3426d0..738e8498b4a1d650047f7190c435 100644
|
|
--- a/hw/block/vhost-user-blk.c
|
|
+++ b/hw/block/vhost-user-blk.c
|
|
@@ -47,6 +47,8 @@ static const int user_feature_bits[] = {
|
|
VIRTIO_RING_F_INDIRECT_DESC,
|
|
VIRTIO_RING_F_EVENT_IDX,
|
|
VIRTIO_F_NOTIFY_ON_EMPTY,
|
|
+ VIRTIO_F_RING_PACKED,
|
|
+ VIRTIO_F_IOMMU_PLATFORM,
|
|
VHOST_INVALID_FEATURE_BIT
|
|
};
|
|
|