[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 13/18] vhost-net: vhost-user feature bits suppor
From: |
Nikolay Nikolaev |
Subject: |
[Qemu-devel] [PATCH v10 13/18] vhost-net: vhost-user feature bits support |
Date: |
Tue, 27 May 2014 15:06:16 +0300 |
User-agent: |
StGit/0.17.1-dirty |
Handle the feature bits negotiation when using vhost-user. Allow
the underlying implementation to have a finer control over all the
bits except the VIRTIO_NET_F_MAC.
Signed-off-by: Nikolay Nikolaev <address@hidden>
---
hw/net/vhost_net.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 2ec36d3..5f06736 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -54,6 +54,38 @@ static const int kernel_feature_bits[] = {
VHOST_INVALID_FEATURE_BIT
};
+/* Features supported by others. */
+const int user_feature_bits[] = {
+ VIRTIO_F_NOTIFY_ON_EMPTY,
+ VIRTIO_RING_F_INDIRECT_DESC,
+ VIRTIO_RING_F_EVENT_IDX,
+
+ VIRTIO_F_ANY_LAYOUT,
+ VIRTIO_NET_F_CSUM,
+ VIRTIO_NET_F_GUEST_CSUM,
+ VIRTIO_NET_F_GSO,
+ VIRTIO_NET_F_GUEST_TSO4,
+ VIRTIO_NET_F_GUEST_TSO6,
+ VIRTIO_NET_F_GUEST_ECN,
+ VIRTIO_NET_F_GUEST_UFO,
+ VIRTIO_NET_F_HOST_TSO4,
+ VIRTIO_NET_F_HOST_TSO6,
+ VIRTIO_NET_F_HOST_ECN,
+ VIRTIO_NET_F_HOST_UFO,
+ VIRTIO_NET_F_MRG_RXBUF,
+ VIRTIO_NET_F_STATUS,
+ VIRTIO_NET_F_CTRL_VQ,
+ VIRTIO_NET_F_CTRL_RX,
+ VIRTIO_NET_F_CTRL_VLAN,
+ VIRTIO_NET_F_CTRL_RX_EXTRA,
+ VIRTIO_NET_F_CTRL_MAC_ADDR,
+ VIRTIO_NET_F_CTRL_GUEST_OFFLOADS,
+
+ VIRTIO_NET_F_MQ,
+
+ VHOST_INVALID_FEATURE_BIT
+};
+
static const int *vhost_net_get_feature_bits(struct vhost_net *net)
{
const int *feature_bits = 0;
@@ -62,6 +94,9 @@ static const int *vhost_net_get_feature_bits(struct vhost_net
*net)
case NET_CLIENT_OPTIONS_KIND_TAP:
feature_bits = kernel_feature_bits;
break;
+ case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
+ feature_bits = user_feature_bits;
+ break;
default:
error_report("Feature bits not defined for this type: %d",
net->nc->info->type);
- [Qemu-devel] [PATCH v10 02/18] Add chardev API qemu_chr_fe_read_all, (continued)
- [Qemu-devel] [PATCH v10 02/18] Add chardev API qemu_chr_fe_read_all, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 03/18] Add chardev API qemu_chr_fe_set_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 04/18] Add chardev API qemu_chr_fe_get_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 05/18] Add G_IO_HUP handler for socket chardev, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 06/18] vhost: add vhost_get_features and vhost_ack_features, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 07/18] vhost_net should call the poll callback only when it is set, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 08/18] Refactor virtio-net to use generic get_vhost_net, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 09/18] vhost_net_init will use VhostNetOptions to get all its arguments, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 10/18] Add vhost_ops to vhost_dev struct and replace all relevant ioctls, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 12/18] Add vhost-user as a vhost backend., Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 13/18] vhost-net: vhost-user feature bits support,
Nikolay Nikolaev <=
- [Qemu-devel] [PATCH v10 14/18] Add new vhost-user netdev backend, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 15/18] Add the vhost-user netdev backend to the command line, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 16/18] Add vhost-user protocol documentation, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 17/18] libqemustub: add stubs to be able to use qemu-char.c, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 18/18] Add qtest for vhost-user, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 11/18] Add vhost-backend and VhostBackendType, Nikolay Nikolaev, 2014/05/27
- Re: [Qemu-devel] [PATCH v10 00/18] Vhost and vhost-net support for userspace based backends, Anshul Makkar, 2014/05/28