Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
virtio: remove kernel virtio header dependencies
[vpp.git]
/
src
/
vnet
/
devices
/
virtio
/
vhost_user_api.c
diff --git
a/src/vnet/devices/virtio/vhost_user_api.c
b/src/vnet/devices/virtio/vhost_user_api.c
index
6736533
..
ec335c5
100644
(file)
--- a/
src/vnet/devices/virtio/vhost_user_api.c
+++ b/
src/vnet/devices/virtio/vhost_user_api.c
@@
-65,10
+65,10
@@
vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp)
u8 *mac_p = NULL;
if (mp->disable_mrg_rxbuf)
u8 *mac_p = NULL;
if (mp->disable_mrg_rxbuf)
- disabled_features =
(1ULL << FEAT_
VIRTIO_NET_F_MRG_RXBUF);
+ disabled_features =
VIRTIO_FEATURE (
VIRTIO_NET_F_MRG_RXBUF);
if (mp->disable_indirect_desc)
if (mp->disable_indirect_desc)
- disabled_features |=
(1ULL << FEAT_VIRTIO
_F_INDIRECT_DESC);
+ disabled_features |=
VIRTIO_FEATURE (VIRTIO_RING
_F_INDIRECT_DESC);
/*
* GSO and PACKED are not supported by feature mask via binary API. We
/*
* GSO and PACKED are not supported by feature mask via binary API. We
@@
-76,7
+76,7
@@
vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp)
* explicitly via enable_gso and enable_packed argument
*/
disabled_features |= FEATURE_VIRTIO_NET_F_HOST_GUEST_TSO_FEATURE_BITS |
* explicitly via enable_gso and enable_packed argument
*/
disabled_features |= FEATURE_VIRTIO_NET_F_HOST_GUEST_TSO_FEATURE_BITS |
-
(1ULL << FEAT_
VIRTIO_F_RING_PACKED);
+
VIRTIO_FEATURE (
VIRTIO_F_RING_PACKED);
features &= ~disabled_features;
if (mp->use_custom_mac)
features &= ~disabled_features;
if (mp->use_custom_mac)
@@
-129,7
+129,7
@@
vl_api_modify_vhost_user_if_t_handler (vl_api_modify_vhost_user_if_t * mp)
* explicitly via enable_gso and enable_packed argument
*/
disabled_features |= FEATURE_VIRTIO_NET_F_HOST_GUEST_TSO_FEATURE_BITS |
* explicitly via enable_gso and enable_packed argument
*/
disabled_features |= FEATURE_VIRTIO_NET_F_HOST_GUEST_TSO_FEATURE_BITS |
-
(1ULL << FEAT_
VIRTIO_F_RING_PACKED);
+
VIRTIO_FEATURE (
VIRTIO_F_RING_PACKED);
features &= ~disabled_features;
rv = vhost_user_modify_if (vnm, vm, (char *) mp->sock_filename,
features &= ~disabled_features;
rv = vhost_user_modify_if (vnm, vm, (char *) mp->sock_filename,
@@
-211,7
+211,7
@@
static void
filter_sw_if_index = htonl (mp->sw_if_index);
if (filter_sw_if_index != ~0)
filter_sw_if_index = htonl (mp->sw_if_index);
if (filter_sw_if_index != ~0)
- return; /* UNIMPLEMENTED */
+ VALIDATE_SW_IF_INDEX (mp);
rv = vhost_user_dump_ifs (vnm, vm, &ifaces);
if (rv)
rv = vhost_user_dump_ifs (vnm, vm, &ifaces);
if (rv)
@@
-219,8
+219,11
@@
static void
vec_foreach (vuid, ifaces)
{
vec_foreach (vuid, ifaces)
{
- send_sw_interface_vhost_user_details (am, reg, vuid, mp->context);
+ if ((filter_sw_if_index == ~0) ||
+ (vuid->sw_if_index == filter_sw_if_index))
+ send_sw_interface_vhost_user_details (am, reg, vuid, mp->context);
}
}
+ BAD_SW_IF_INDEX_LABEL;
vec_free (ifaces);
}
vec_free (ifaces);
}