api: refactor vlibmemory

- separate client/server code for both memory and socket apis
- separate memory api code from generic vlib api code
- move unix_shared_memory_fifo to svm and rename to svm_fifo_t
- overall declutter

Change-Id: I90cdd98ff74d0787d58825b914b0f1eafcfa4dc2
Signed-off-by: Florin Coras <fcoras@cisco.com>

9 files changed, 60 insertions, 71 deletions

diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c
index a8699961b47..b93d3bca1c4 100644
--- a/src/plugins/acl/acl.c
+++ b/src/plugins/acl/acl.c
@@ -138,7 +138,7 @@ vl_api_acl_plugin_get_version_t_handler (vl_api_acl_plugin_get_version_t * mp)
   acl_main_t *am = &acl_main;
   vl_api_acl_plugin_get_version_reply_t *rmp;
   int msg_size = sizeof (*rmp);
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
@@ -1871,7 +1871,7 @@ copy_acl_rule_to_api_rule (vl_api_acl_rule_t * api_rule, acl_rule_t * r)
 }
 
 static void
-send_acl_details (acl_main_t * am, unix_shared_memory_queue_t * q,
+send_acl_details (acl_main_t * am, svm_queue_t * q,
 		  acl_list_t * acl, u32 context)
 {
   vl_api_acl_details_t *mp;
@@ -1909,7 +1909,7 @@ vl_api_acl_dump_t_handler (vl_api_acl_dump_t * mp)
   acl_list_t *acl;
 
   int rv = -1;
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
@@ -1946,7 +1946,7 @@ vl_api_acl_dump_t_handler (vl_api_acl_dump_t * mp)
 
 static void
 send_acl_interface_list_details (acl_main_t * am,
-				 unix_shared_memory_queue_t * q,
+				 svm_queue_t * q,
 				 u32 sw_if_index, u32 context)
 {
   vl_api_acl_interface_list_details_t *mp;
@@ -1999,7 +1999,7 @@ vl_api_acl_interface_list_dump_t_handler (vl_api_acl_interface_list_dump_t *
   vnet_interface_main_t *im = &am->vnet_main->interface_main;
 
   u32 sw_if_index;
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
@@ -2113,7 +2113,7 @@ static void
 }
 
 static void
-send_macip_acl_details (acl_main_t * am, unix_shared_memory_queue_t * q,
+send_macip_acl_details (acl_main_t * am, svm_queue_t * q,
 			macip_acl_list_t * acl, u32 context)
 {
   vl_api_macip_acl_details_t *mp;
@@ -2168,7 +2168,7 @@ vl_api_macip_acl_dump_t_handler (vl_api_macip_acl_dump_t * mp)
   acl_main_t *am = &acl_main;
   macip_acl_list_t *acl;
 
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
@@ -2206,7 +2206,7 @@ vl_api_macip_acl_interface_get_t_handler (vl_api_macip_acl_interface_get_t *
   vl_api_macip_acl_interface_get_reply_t *rmp;
   u32 count = vec_len (am->macip_acl_by_sw_if_index);
   int msg_size = sizeof (*rmp) + sizeof (rmp->acls[0]) * count;
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   int i;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
@@ -2231,7 +2231,7 @@ vl_api_macip_acl_interface_get_t_handler (vl_api_macip_acl_interface_get_t *
 
 static void
 send_macip_acl_interface_list_details (acl_main_t * am,
-				       unix_shared_memory_queue_t * q,
+				       svm_queue_t * q,
 				       u32 sw_if_index,
 				       u32 acl_index, u32 context)
 {
@@ -2257,7 +2257,7 @@ static void
   vl_api_macip_acl_interface_list_dump_t_handler
   (vl_api_macip_acl_interface_list_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   acl_main_t *am = &acl_main;
   u32 sw_if_index = ntohl (mp->sw_if_index);
 
diff --git a/src/plugins/gtpu/gtpu_api.c b/src/plugins/gtpu/gtpu_api.c
index 5a77ab7f851..1b93578a95d 100644
--- a/src/plugins/gtpu/gtpu_api.c
+++ b/src/plugins/gtpu/gtpu_api.c
@@ -148,7 +148,7 @@ out:
 }
 
 static void send_gtpu_tunnel_details
-  (gtpu_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
+  (gtpu_tunnel_t * t, svm_queue_t * q, u32 context)
 {
   vl_api_gtpu_tunnel_details_t *rmp;
   ip4_main_t *im4 = &ip4_main;
@@ -183,7 +183,7 @@ static void send_gtpu_tunnel_details
 static void
 vl_api_gtpu_tunnel_dump_t_handler (vl_api_gtpu_tunnel_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   gtpu_main_t *gtm = &gtpu_main;
   gtpu_tunnel_t *t;
   u32 sw_if_index;
diff --git a/src/plugins/ioam/lib-trace/trace_api.c b/src/plugins/ioam/lib-trace/trace_api.c
index cd00c591fda..bb043f7c831 100644
--- a/src/plugins/ioam/lib-trace/trace_api.c
+++ b/src/plugins/ioam/lib-trace/trace_api.c
@@ -62,7 +62,7 @@
 
 #define TRACE_REPLY_MACRO(t)                                          \
 do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
+    svm_queue_t * q =                            \
     vl_api_client_index_to_input_queue (mp->client_index);      \
     if (!q)                                                     \
         return;                                                 \
@@ -78,7 +78,7 @@ do {                                                            \
 /* *INDENT-OFF* */
 #define TRACE_REPLY_MACRO2(t, body)                                   \
 do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
+    svm_queue_t * q;                             \
     rv = vl_msg_api_pd_handler (mp, rv);                        \
     q = vl_api_client_index_to_input_queue (mp->client_index);  \
     if (!q)                                                     \
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
index 3bc682bfbfb..870764eb971 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
@@ -61,7 +61,7 @@
 
 #define VXLAN_GPE_REPLY_MACRO(t)                                \
 do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
+    svm_queue_t * q =                            \
     vl_api_client_index_to_input_queue (mp->client_index);      \
     if (!q)                                                     \
         return;                                                 \
@@ -77,7 +77,7 @@ do {                                                            \
 /* *INDENT-OFF* */
 #define VXLAN_GPE_REPLY_MACRO2(t, body)                         \
 do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
+    svm_queue_t * q;                             \
     rv = vl_msg_api_pd_handler (mp, rv);                        \
     q = vl_api_client_index_to_input_queue (mp->client_index);  \
     if (!q)                                                     \
diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c
index 684f53c5193..068fd3d69f0 100644
--- a/src/plugins/memif/memif_api.c
+++ b/src/plugins/memif/memif_api.c
@@ -60,7 +60,7 @@
  */
 #define REPLY_MACRO(t)                                          \
 do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
+    svm_queue_t * q =                            \
     vl_api_client_index_to_input_queue (mp->client_index);      \
     if (!q)                                                     \
         return;                                                 \
@@ -75,7 +75,7 @@ do {                                                            \
 
 #define REPLY_MACRO2(t, body)                                   \
 do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
+    svm_queue_t * q =                            \
     vl_api_client_index_to_input_queue (mp->client_index);      \
     if (!q)                                                     \
         return;                                                 \
@@ -219,7 +219,7 @@ vl_api_memif_delete_t_handler (vl_api_memif_delete_t * mp)
 }
 
 static void
-send_memif_details (unix_shared_memory_queue_t * q,
+send_memif_details (svm_queue_t * q,
 		    memif_if_t * mif,
 		    vnet_sw_interface_t * swif,
 		    u8 * interface_name, u32 context)
@@ -270,7 +270,7 @@ vl_api_memif_dump_t_handler (vl_api_memif_dump_t * mp)
   vnet_sw_interface_t *swif;
   memif_if_t *mif;
   u8 *if_name = 0;
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
diff --git a/src/plugins/memif/memif_test.c b/src/plugins/memif/memif_test.c
index 559d0f7d19f..00b3ad5d22c 100644
--- a/src/plugins/memif/memif_test.c
+++ b/src/plugins/memif/memif_test.c
@@ -361,7 +361,7 @@ vat_plugin_register (vat_main_t * vam)
   const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc;
   foreach_vl_msg_name_crc_vpe;
 #undef _
-  mm->ping_id = vl_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC));
+  mm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC));
 
   if (mm->msg_id_base != (u16) ~0)
     memif_vat_api_hookup (vam);
diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c
index d0efb001843..bc192a782f6 100644
--- a/src/plugins/nat/nat_api.c
+++ b/src/plugins/nat/nat_api.c
@@ -174,8 +174,7 @@ vl_api_nat_set_workers_t_print (vl_api_nat_set_workers_t * mp, void *handle)
 }
 
 static void
-send_nat_worker_details (u32 worker_index, unix_shared_memory_queue_t * q,
-			 u32 context)
+send_nat_worker_details (u32 worker_index, svm_queue_t * q, u32 context)
 {
   vl_api_nat_worker_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -196,7 +195,7 @@ send_nat_worker_details (u32 worker_index, unix_shared_memory_queue_t * q,
 static void
 vl_api_nat_worker_dump_t_handler (vl_api_nat_worker_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   u32 *worker_index;
 
@@ -316,7 +315,7 @@ vl_api_nat_get_reass_t_print (vl_api_nat_get_reass_t * mp, void *handle)
 
 typedef struct nat_api_walk_ctx_t_
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   u32 context;
 } nat_api_walk_ctx_t;
 
@@ -369,7 +368,7 @@ nat_ip6_reass_walk_api (nat_reass_ip6_t * reass, void *arg)
 static void
 vl_api_nat_reass_dump_t_handler (vl_api_nat_reass_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
@@ -469,8 +468,7 @@ static void *vl_api_nat44_add_del_address_range_t_print
 
 static void
 send_nat44_address_details (snat_address_t * a,
-			    unix_shared_memory_queue_t * q, u32 context,
-			    u8 twice_nat)
+			    svm_queue_t * q, u32 context, u8 twice_nat)
 {
   vl_api_nat44_address_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -495,7 +493,7 @@ send_nat44_address_details (snat_address_t * a,
 static void
 vl_api_nat44_address_dump_t_handler (vl_api_nat44_address_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_address_t *a;
 
@@ -556,7 +554,7 @@ static void *vl_api_nat44_interface_add_del_feature_t_print
 
 static void
 send_nat44_interface_details (snat_interface_t * i,
-			      unix_shared_memory_queue_t * q, u32 context)
+			      svm_queue_t * q, u32 context)
 {
   vl_api_nat44_interface_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -576,7 +574,7 @@ send_nat44_interface_details (snat_interface_t * i,
 static void
 vl_api_nat44_interface_dump_t_handler (vl_api_nat44_interface_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_interface_t *i;
 
@@ -638,8 +636,7 @@ static void *vl_api_nat44_interface_add_del_output_feature_t_print
 
 static void
 send_nat44_interface_output_feature_details (snat_interface_t * i,
-					     unix_shared_memory_queue_t * q,
-					     u32 context)
+					     svm_queue_t * q, u32 context)
 {
   vl_api_nat44_interface_output_feature_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -659,7 +656,7 @@ static void
   vl_api_nat44_interface_output_feature_dump_t_handler
   (vl_api_nat44_interface_output_feature_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_interface_t *i;
 
@@ -745,8 +742,7 @@ static void *vl_api_nat44_add_del_static_mapping_t_print
 
 static void
 send_nat44_static_mapping_details (snat_static_mapping_t * m,
-				   unix_shared_memory_queue_t * q,
-				   u32 context)
+				   svm_queue_t * q, u32 context)
 {
   vl_api_nat44_static_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -771,8 +767,7 @@ send_nat44_static_mapping_details (snat_static_mapping_t * m,
 
 static void
 send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m,
-				       unix_shared_memory_queue_t * q,
-				       u32 context)
+				       svm_queue_t * q, u32 context)
 {
   vl_api_nat44_static_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -798,7 +793,7 @@ static void
 vl_api_nat44_static_mapping_dump_t_handler (vl_api_nat44_static_mapping_dump_t
 					    * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m;
   snat_static_map_resolve_t *rp;
@@ -891,8 +886,7 @@ static void *vl_api_nat44_add_del_identity_mapping_t_print
 
 static void
 send_nat44_identity_mapping_details (snat_static_mapping_t * m,
-				     unix_shared_memory_queue_t * q,
-				     u32 context)
+				     svm_queue_t * q, u32 context)
 {
   vl_api_nat44_identity_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -914,8 +908,7 @@ send_nat44_identity_mapping_details (snat_static_mapping_t * m,
 
 static void
 send_nat44_identity_map_resolve_details (snat_static_map_resolve_t * m,
-					 unix_shared_memory_queue_t * q,
-					 u32 context)
+					 svm_queue_t * q, u32 context)
 {
   vl_api_nat44_identity_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -938,7 +931,7 @@ static void
   vl_api_nat44_identity_mapping_dump_t_handler
   (vl_api_nat44_identity_mapping_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m;
   snat_static_map_resolve_t *rp;
@@ -1008,8 +1001,7 @@ static void *vl_api_nat44_add_del_interface_addr_t_print
 
 static void
 send_nat44_interface_addr_details (u32 sw_if_index,
-				   unix_shared_memory_queue_t * q,
-				   u32 context, u8 twice_nat)
+				   svm_queue_t * q, u32 context, u8 twice_nat)
 {
   vl_api_nat44_interface_addr_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -1029,7 +1021,7 @@ static void
 vl_api_nat44_interface_addr_dump_t_handler (vl_api_nat44_interface_addr_dump_t
 					    * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   u32 *i;
 
@@ -1057,8 +1049,7 @@ vl_api_nat44_interface_addr_dump_t_print (vl_api_nat44_interface_addr_dump_t *
 }
 
 static void
-send_nat44_user_details (snat_user_t * u, unix_shared_memory_queue_t * q,
-			 u32 context)
+send_nat44_user_details (snat_user_t * u, svm_queue_t * q, u32 context)
 {
   vl_api_nat44_user_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -1081,7 +1072,7 @@ send_nat44_user_details (snat_user_t * u, unix_shared_memory_queue_t * q,
 static void
 vl_api_nat44_user_dump_t_handler (vl_api_nat44_user_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_main_per_thread_data_t *tsm;
   snat_user_t *u;
@@ -1109,7 +1100,7 @@ vl_api_nat44_user_dump_t_print (vl_api_nat44_user_dump_t * mp, void *handle)
 
 static void
 send_nat44_user_session_details (snat_session_t * s,
-				 unix_shared_memory_queue_t * q, u32 context)
+				 svm_queue_t * q, u32 context)
 {
   vl_api_nat44_user_session_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -1145,7 +1136,7 @@ static void
 vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t *
 					  mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_main_per_thread_data_t *tsm;
   snat_session_t *s;
@@ -1267,8 +1258,7 @@ static void *vl_api_nat44_add_del_lb_static_mapping_t_print
 
 static void
 send_nat44_lb_static_mapping_details (snat_static_mapping_t * m,
-				      unix_shared_memory_queue_t * q,
-				      u32 context)
+				      svm_queue_t * q, u32 context)
 {
   vl_api_nat44_lb_static_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -1306,7 +1296,7 @@ static void
   vl_api_nat44_lb_static_mapping_dump_t_handler
   (vl_api_nat44_lb_static_mapping_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m;
 
@@ -1397,7 +1387,7 @@ static void
   vl_api_nat44_forwarding_is_enabled_t_handler
   (vl_api_nat44_forwarding_is_enabled_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   vl_api_nat44_forwarding_is_enabled_reply_t *rmp;
 
@@ -1562,8 +1552,7 @@ vl_api_nat_det_reverse_t_print (vl_api_nat_det_reverse_t * mp, void *handle)
 }
 
 static void
-sent_nat_det_map_details (snat_det_map_t * m, unix_shared_memory_queue_t * q,
-			  u32 context)
+sent_nat_det_map_details (snat_det_map_t * m, svm_queue_t * q, u32 context)
 {
   vl_api_nat_det_map_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -1587,7 +1576,7 @@ sent_nat_det_map_details (snat_det_map_t * m, unix_shared_memory_queue_t * q,
 static void
 vl_api_nat_det_map_dump_t_handler (vl_api_nat_det_map_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   snat_det_map_t *m;
 
@@ -1778,7 +1767,7 @@ vl_api_nat_det_close_session_in_t_print (vl_api_nat_det_close_session_in_t *
 
 static void
 send_nat_det_session_details (snat_det_session_t * s,
-			      unix_shared_memory_queue_t * q, u32 context)
+			      svm_queue_t * q, u32 context)
 {
   vl_api_nat_det_session_details_t *rmp;
   snat_main_t *sm = &snat_main;
@@ -1800,7 +1789,7 @@ send_nat_det_session_details (snat_det_session_t * s,
 static void
 vl_api_nat_det_session_dump_t_handler (vl_api_nat_det_session_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
   ip4_address_t user_addr;
   snat_det_map_t *dm;
@@ -1896,7 +1885,7 @@ static void *vl_api_nat64_add_del_pool_addr_range_t_print
 
 typedef struct nat64_api_walk_ctx_t_
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   u32 context;
   nat64_db_t *db;
 } nat64_api_walk_ctx_t;
@@ -1931,7 +1920,7 @@ nat64_api_pool_walk (snat_address_t * a, void *arg)
 static void
 vl_api_nat64_pool_addr_dump_t_handler (vl_api_nat64_pool_addr_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
@@ -2013,7 +2002,7 @@ nat64_api_interface_walk (snat_interface_t * i, void *arg)
 static void
 vl_api_nat64_interface_dump_t_handler (vl_api_nat64_interface_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
@@ -2111,7 +2100,7 @@ nat64_api_bib_walk (nat64_db_bib_entry_t * bibe, void *arg)
 static void
 vl_api_nat64_bib_dump_t_handler (vl_api_nat64_bib_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   nat64_main_t *nm = &nat64_main;
   nat64_db_t *db;
 
@@ -2244,7 +2233,7 @@ nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg)
 static void
 vl_api_nat64_st_dump_t_handler (vl_api_nat64_st_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   nat64_main_t *nm = &nat64_main;
   nat64_db_t *db;
 
@@ -2328,7 +2317,7 @@ nat64_api_prefix_walk (nat64_prefix_t * p, void *arg)
 static void
 vl_api_nat64_prefix_dump_t_handler (vl_api_nat64_prefix_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   q = vl_api_client_index_to_input_queue (mp->client_index);
   if (q == 0)
diff --git a/src/plugins/pppoe/pppoe_api.c b/src/plugins/pppoe/pppoe_api.c
index 04326572ce7..f8a02279cc9 100644
--- a/src/plugins/pppoe/pppoe_api.c
+++ b/src/plugins/pppoe/pppoe_api.c
@@ -118,7 +118,7 @@ out:
 }
 
 static void send_pppoe_session_details
-  (pppoe_session_t * t, unix_shared_memory_queue_t * q, u32 context)
+  (pppoe_session_t * t, svm_queue_t * q, u32 context)
 {
   vl_api_pppoe_session_details_t *rmp;
   ip4_main_t *im4 = &ip4_main;
@@ -152,7 +152,7 @@ static void send_pppoe_session_details
 static void
 vl_api_pppoe_session_dump_t_handler (vl_api_pppoe_session_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   pppoe_main_t *pem = &pppoe_main;
   pppoe_session_t *t;
   u32 sw_if_index;
diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c
index 02ea29b6443..73136e09f91 100644
--- a/src/plugins/stn/stn_api.c
+++ b/src/plugins/stn/stn_api.c
@@ -108,7 +108,7 @@ vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp)
 }
 
 static void
-send_stn_rule (stn_rule_t *r, unix_shared_memory_queue_t *q, u32 context)
+send_stn_rule (stn_rule_t *r, svm_queue_t *q, u32 context)
 {
   vl_api_stn_rule_details_t *rmp;
 
@@ -137,7 +137,7 @@ send_stn_rule (stn_rule_t *r, unix_shared_memory_queue_t *q, u32 context)
 static void
 vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t *mp)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
   stn_main_t *stn = &stn_main;
   stn_rule_t *r;