VPP-246 Coding standards cleanup - vnet/vnet/classify

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

diff --git a/src/vnet/devices/virtio/vhost-user.h b/src/vnet/devices/virtio/vhost-user.h
index ceced34..105b92b 100644 (file)
--- a/src/vnet/devices/virtio/vhost-user.h
+++ b/src/vnet/devices/virtio/vhost-user.h
@@ -23,6 +23,7 @@
 #define VHOST_VRING_IDX_RX(qid)         (2*qid)
 #define VHOST_VRING_IDX_TX(qid)         (2*qid + 1)
 
+#define VHOST_USER_VRING_NOFD_MASK      0x100
 #define VIRTQ_DESC_F_NEXT               1
 #define VIRTQ_DESC_F_INDIRECT           4
 #define VHOST_USER_REPLY_MASK       (0x1 << 2)
@@ -191,7 +192,7 @@ typedef struct vhost_user_msg {
 typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  u16 qsz;
+  u16 qsz_mask;
   u16 last_avail_idx;
   u16 last_used_idx;
   u16 n_since_last_int;
@@ -222,7 +223,7 @@ typedef struct
   u32 is_up;
   u32 admin_up;
   u32 unix_server_index;
-  u32 unix_file_index;
+  u32 clib_file_index;
   char sock_filename[256];
   int sock_errno;
   uword if_index;
@@ -310,6 +311,9 @@ typedef struct
 
   /* The number of rx interface/queue pairs in interrupt mode */
   u32 ifq_count;
+
+  /* debug on or off */
+  u8 debug;
 } vhost_user_main_t;
 
 typedef struct