[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/21] hw/virtio: incorporate backend features in features
From: |
Alex Bennée |
Subject: |
[PATCH v3 06/21] hw/virtio: incorporate backend features in features |
Date: |
Tue, 26 Jul 2022 20:21:35 +0100 |
There are some extra bits used over a vhost-user connection which are
hidden from the device itself. We need to set them here to ensure we
enable things like the protocol extensions.
Currently net/vhost-user.c has it's own inscrutable way of persisting
this data but it really should live in the core vhost_user code.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
hw/virtio/vhost-user.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 55fce18480..a96a586ebf 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1461,7 +1461,14 @@ static int vhost_user_set_features(struct vhost_dev *dev,
*/
bool log_enabled = features & (0x1ULL << VHOST_F_LOG_ALL);
- return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features,
+ /*
+ * We need to include any extra backend only feature bits that
+ * might be needed by our device. Currently this includes the
+ * VHOST_USER_F_PROTOCOL_FEATURES bit for enabling protocol
+ * features.
+ */
+ return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES,
+ features | dev->backend_features,
log_enabled);
}
--
2.30.2
- [PATCH v3 for 7.2 00/21] virtio-gpio and various virtio cleanups, Alex Bennée, 2022/07/26
- [PATCH v3 01/21] include/hw/virtio: more comment for VIRTIO_F_BAD_FEATURE, Alex Bennée, 2022/07/26
- [PATCH v3 02/21] include/hw: document vhost_dev feature life-cycle, Alex Bennée, 2022/07/26
- [PATCH v3 03/21] hw/virtio: fix some coding style issues, Alex Bennée, 2022/07/26
- [PATCH v3 15/21] tests/qtest: use qos_printf instead of g_test_message, Alex Bennée, 2022/07/26
- [PATCH v3 06/21] hw/virtio: incorporate backend features in features,
Alex Bennée <=
- [PATCH v3 20/21] tests/qtest: add a get_features op to vhost-user-test, Alex Bennée, 2022/07/26
- [PATCH v3 04/21] hw/virtio: log potentially buggy guest drivers, Alex Bennée, 2022/07/26
- [PATCH v3 05/21] block/vhost-user-blk-server: don't expose VHOST_USER_F_PROTOCOL_FEATURES, Alex Bennée, 2022/07/26
- [PATCH v3 07/21] hw/virtio: gracefully handle unset vhost_dev vdev, Alex Bennée, 2022/07/26
- [PATCH v3 08/21] hw/virtio: handle un-configured shutdown in virtio-pci, Alex Bennée, 2022/07/26