16 files changed, 17 insertions, 17 deletions
diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.c b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
index 82719aafbc8..22e44f1db5a 100644
--- a/src/vpp-api/java/jvpp-acl/jvpp_acl.c
+++ b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = uword_to_pointer (queue_address, unix_shared_memory_queue_t *);
+  plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.h b/src/vpp-api/java/jvpp-acl/jvpp_acl.h
index 726f7298221..d1ec78feb19 100644
--- a/src/vpp-api/java/jvpp-acl/jvpp_acl.h
+++ b/src/vpp-api/java/jvpp-acl/jvpp_acl.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-acl */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;
diff --git a/src/vpp-api/java/jvpp-common/jvpp_common.h b/src/vpp-api/java/jvpp-common/jvpp_common.h
index 34502d04ab8..14027a96f78 100644
--- a/src/vpp-api/java/jvpp-common/jvpp_common.h
+++ b/src/vpp-api/java/jvpp-common/jvpp_common.h
@@ -35,7 +35,7 @@ typedef struct {
     JavaVM *jvm;
 
     /* Convenience */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
     u32 my_client_index;
     uword *messages_hash;
 } jvpp_main_t;
diff --git a/src/vpp-api/java/jvpp-core/jvpp_core.c b/src/vpp-api/java/jvpp-core/jvpp_core.c
index b12f63af16f..09d753026d7 100644
--- a/src/vpp-api/java/jvpp-core/jvpp_core.c
+++ b/src/vpp-api/java/jvpp-core/jvpp_core.c
@@ -30,7 +30,7 @@
 // TODO: generate jvpp_plugin_name.c files (or at least reuse plugin's main structure)
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;
@@ -50,7 +50,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_init0
 (JNIEnv * env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
     core_main_t * plugin_main = &core_main;
     plugin_main->my_client_index = my_client_index;
-    plugin_main->vl_input_queue = uword_to_pointer (queue_address, unix_shared_memory_queue_t *);
+    plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
 
     plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
     plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.c b/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.c
index 286a9ceccbe..8e523caa9f8 100644
--- a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.c
+++ b/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+  plugin_main->vl_input_queue = (svm_queue_t *)queue_address;
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.h b/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.h
index 447776ce0b8..fa7c8b7c53b 100644
--- a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.h
+++ b/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-gtpu */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
index 8d486134cfa..74ae438e136 100644
--- a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
+++ b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = uword_to_pointer (queue_address, unix_shared_memory_queue_t *);
+  plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h
index 8b243def8e8..596a05400e9 100644
--- a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h
+++ b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-IOAM-EXPORT */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
index 4b9d1a58932..ce1da6979e7 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = uword_to_pointer (queue_address, unix_shared_memory_queue_t *);
+  plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
index 81e2a1bbbb6..51db3da83b5 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-IOAM-POT */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
index f917d1c684e..3532d91e3a4 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
+++ b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = uword_to_pointer (queue_address, unix_shared_memory_queue_t *);
+  plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h
index cb0b27e199c..752b599f4b8 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h
+++ b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-IOAM-TRACE */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;
diff --git a/src/vpp-api/java/jvpp-nat/jvpp_nat.c b/src/vpp-api/java/jvpp-nat/jvpp_nat.c
index 56c74d21141..bdae1e64913 100644
--- a/src/vpp-api/java/jvpp-nat/jvpp_nat.c
+++ b/src/vpp-api/java/jvpp-nat/jvpp_nat.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nat_JVppNatImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_nat_JVppNatImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = uword_to_pointer (queue_address, unix_shared_memory_queue_t *);
+  plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-nat/jvpp_nat.h b/src/vpp-api/java/jvpp-nat/jvpp_nat.h
index c8f6b683fea..9bff974a976 100644
--- a/src/vpp-api/java/jvpp-nat/jvpp_nat.h
+++ b/src/vpp-api/java/jvpp-nat/jvpp_nat.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-NAT */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;
diff --git a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c
index d339700ea22..02bd20e6bb4 100644
--- a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c
+++ b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+  plugin_main->vl_input_queue = (svm_queue_t *)queue_address;
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h
index 4523ba9cd96..7606a7ef86e 100644
--- a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h
+++ b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-pppoe */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;