Add custom mac address option to vhost interfaces.

[vpp.git] / vnet / vnet / devices / virtio / vhost-user.h

diff --git a/vnet/vnet/devices/virtio/vhost-user.h b/vnet/vnet/devices/virtio/vhost-user.h
index 3b57bcb..4eb4b81 100644 (file)
--- a/vnet/vnet/devices/virtio/vhost-user.h
+++ b/vnet/vnet/devices/virtio/vhost-user.h
@@ -24,6 +24,18 @@
 #define VHOST_NET_VRING_NUM             2
 
 #define VIRTQ_DESC_F_NEXT               1
+#define VHOST_USER_REPLY_MASK       (0x1 << 2)
+
+#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
+#define VHOST_USER_PROTOCOL_F_MQ   0
+#define VHOST_USER_PROTOCOL_FEATURES   (1ULL << VHOST_USER_PROTOCOL_F_MQ)
+
+/* If multiqueue is provided by host, then we suppport it. */
+#define VIRTIO_NET_CTRL_MQ   4
+#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET        0
+#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN        1
+#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX        0x8000
+#endif
 
 #define foreach_virtio_net_feature      \
  _ (VIRTIO_NET_F_MRG_RXBUF, 15)         \
@@ -38,7 +50,7 @@ typedef enum {
 int vhost_user_create_if(vnet_main_t * vnm, vlib_main_t * vm, 
     const char * sock_filename, u8 is_server,
     u32 * sw_if_index, u64 feature_mask,
-    u8 renumber, u32 custom_dev_instance);
+    u8 renumber, u32 custom_dev_instance, u8 *hwaddr);
 int vhost_user_modify_if(vnet_main_t * vnm, vlib_main_t * vm,
     const char * sock_filename, u8 is_server,
     u32 sw_if_index, u64 feature_mask,
@@ -83,6 +95,12 @@ typedef enum vhost_user_req {
   VHOST_USER_SET_VRING_KICK = 12,
   VHOST_USER_SET_VRING_CALL = 13,
   VHOST_USER_SET_VRING_ERR = 14,
+#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
+  VHOST_USER_GET_PROTOCOL_FEATURES = 15,
+  VHOST_USER_SET_PROTOCOL_FEATURES = 16,
+  VHOST_USER_GET_QUEUE_NUM = 17,
+  VHOST_USER_SET_VRING_ENABLE = 18,
+#endif
   VHOST_USER_MAX
 } vhost_user_req_t;