Commit 5f4c01ca authored by Nikolay Nikolaev's avatar Nikolay Nikolaev Committed by Michael S. Tsirkin
Browse files

vhost-net: vhost-user feature bits support 



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: default avatarNikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 5f6f6664

hw/net/vhost_net.c

+35 −0
Original line number Diff line number Diff line
@@ -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);