[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 01/22] hw/virtio: incorporate backend features in features
From: |
Alex Bennée |
Subject: |
[PATCH v4 01/22] hw/virtio: incorporate backend features in features |
Date: |
Tue, 2 Aug 2022 10:49:49 +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>
Message-Id: <20220726192150.2435175-7-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 75b8df21a4..1936a44e82 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1460,7 +1460,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 v4 for 7.2 00/22] virtio-gpio and various virtio cleanups, Alex Bennée, 2022/08/02
- [PATCH v4 09/22] hw/virtio: add some vhost-user trace events, Alex Bennée, 2022/08/02
- [PATCH v4 03/22] hw/virtio: handle un-configured shutdown in virtio-pci, Alex Bennée, 2022/08/02
- [PATCH v4 06/22] include/hw: document vhost_dev feature life-cycle, Alex Bennée, 2022/08/02
- [PATCH v4 01/22] hw/virtio: incorporate backend features in features,
Alex Bennée <=
- [PATCH v4 07/22] hw/virtio: fix some coding style issues, Alex Bennée, 2022/08/02
- [PATCH v4 05/22] include/hw/virtio: more comment for VIRTIO_F_BAD_FEATURE, Alex Bennée, 2022/08/02
- [PATCH v4 17/22] tests/qtest: catch unhandled vhost-user messages, Alex Bennée, 2022/08/02
- [PATCH v4 18/22] tests/qtest: plain g_assert for VHOST_USER_F_PROTOCOL_FEATURES, Alex Bennée, 2022/08/02
- [PATCH v4 02/22] hw/virtio: gracefully handle unset vhost_dev vdev, Alex Bennée, 2022/08/02
- [PATCH v4 10/22] hw/virtio: move vm_running check to virtio_device_started, Alex Bennée, 2022/08/02
- [PATCH v4 04/22] hw/virtio: fix vhost_user_read tracepoint, Alex Bennée, 2022/08/02
- [PATCH v4 08/22] hw/virtio: log potentially buggy guest drivers, Alex Bennée, 2022/08/02
- [PATCH v4 13/22] hw/virtio: add vhost-user-gpio-pci boilerplate, Alex Bennée, 2022/08/02
- [PATCH v4 14/22] tests/qtest: pass stdout/stderr down to subtests, Alex Bennée, 2022/08/02