[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 18/20] hw/virtio: validate F_STANDALONE also supports othe
From: |
Alex Bennée |
Subject: |
[RFC PATCH v3 18/20] hw/virtio: validate F_STANDALONE also supports other protocol features |
Date: |
Mon, 10 Jul 2023 16:35:20 +0100 |
If the backend advertises F_STANDALONE validate that it supports the
other mandatory features or error out.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
hw/virtio/vhost-user.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 28b021d5d3..3116b3e46a 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -74,6 +74,8 @@ enum VhostUserProtocolFeature {
/* Feature 14 reserved for VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS. */
VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS = 15,
VHOST_USER_PROTOCOL_F_STATUS = 16,
+ VHOST_USER_PROTOCOL_F_XEN_MMAP = 17,
+ VHOST_USER_PROTOCOL_F_STANDALONE = 18,
VHOST_USER_PROTOCOL_F_MAX
};
@@ -2048,6 +2050,21 @@ static int vhost_user_backend_init(struct vhost_dev
*dev, void *opaque,
}
}
+ /*
+ * If the backend supports F_STANDALONE we should validate it
+ * supports the other features we expect. We can't check for
+ * F_CONFIG support until we know if there is a config space
+ * to manage.
+ */
+ if (virtio_has_feature(protocol_features,
+ VHOST_USER_PROTOCOL_F_STANDALONE)) {
+ if (!virtio_has_feature(protocol_features,
VHOST_USER_PROTOCOL_F_STATUS)) {
+ error_setg(errp, "vhost-user device expecting F_STANDALONE
device to also "
+ "support F_STATUS but it does not.");
+ return -EPROTO;
+ }
+ }
+
/* final set of protocol features */
dev->protocol_features = protocol_features;
err = vhost_user_set_protocol_features(dev, dev->protocol_features);
--
2.39.2
- Re: [PATCH v3 07/20] virtio: add vhost-user-base and a generic vhost-user-device, (continued)
- [PATCH v3 11/20] hw/virtio: derive vhost-user-gpio from vhost-user-device, Alex Bennée, 2023/07/10
- [PATCH v3 02/20] include/hw: document the device_class_set_parent_* fns, Alex Bennée, 2023/07/10
- [RFC PATCH v3 15/20] hw/virtio: move vhost_user_init earlier, Alex Bennée, 2023/07/10
- [RFC PATCH v3 19/20] hw/virtio: probe backend for specs if it supports it, Alex Bennée, 2023/07/10
- [PATCH v3 09/20] hw/virtio: derive vhost-user-rng from vhost-user-device, Alex Bennée, 2023/07/10
- [PATCH v3 06/20] include/hw/virtio: document some more usage of notifiers, Alex Bennée, 2023/07/10
- [PATCH v3 08/20] virtio: add PCI stub for vhost-user-device, Alex Bennée, 2023/07/10
- [PATCH v3 10/20] hw/virtio: add config support to vhost-user-device, Alex Bennée, 2023/07/10
- [RFC PATCH v3 18/20] hw/virtio: validate F_STANDALONE also supports other protocol features,
Alex Bennée <=
- [RFC PATCH v3 17/20] hw/virtio: push down allocation responsibility for vhost_dev->vqs, Alex Bennée, 2023/07/10
- [RFC PATCH v3 14/20] docs/interop: define STANDALONE protocol feature for vhost-user, Alex Bennée, 2023/07/10
- [RFC PATCH v3 13/20] docs/system: add a basic enumeration of vhost-user devices, Alex Bennée, 2023/07/10
- [RFC PATCH v3 16/20] hw/virtio: move virtq initialisation into internal helper, Alex Bennée, 2023/07/10
- [RFC PATCH v3 20/20] hw/virtio: allow vhost-user-device to be driven by backend, Alex Bennée, 2023/07/10
- [PATCH v3 12/20] hw/virtio: derive vhost-user-i2c from vhost-user-base, Alex Bennée, 2023/07/10