ipsec: Reference count the SAs

[vpp.git] / src / plugins / avf / avf_test.c

diff --git a/src/plugins/avf/avf_test.c b/src/plugins/avf/avf_test.c
index c980779..17f4308 100644 (file)
--- a/src/plugins/avf/avf_test.c
+++ b/src/plugins/avf/avf_test.c
@@ -64,7 +64,6 @@ typedef struct
 avf_test_main_t avf_test_main;
 
 #define foreach_standard_reply_retval_handler          \
-_(avf_create_reply)                                    \
 _(avf_delete_reply)
 
 #define _(n)                                            \
@@ -94,10 +93,11 @@ api_avf_create (vat_main_t * vam)
   unformat_input_t *i = vam->input;
   vl_api_avf_create_t *mp;
   avf_create_if_args_t args;
+  uint32_t tmp;
   int ret;
   u32 x[4];
 
-  memset (&args, 0, sizeof (avf_create_if_args_t));
+  clib_memset (&args, 0, sizeof (avf_create_if_args_t));
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -110,10 +110,12 @@ api_avf_create (vat_main_t * vam)
        }
       else if (unformat (i, "elog"))
        args.enable_elog = 1;
-      else if (unformat (i, "rx-queue-size %u", &args.rxq_size))
-       ;
-      else if (unformat (i, "tx-queue-size %u", &args.txq_size))
-       ;
+      else if (unformat (i, "rx-queue-size %u", &tmp))
+       args.rxq_size = tmp;
+      else if (unformat (i, "tx-queue-size %u", &tmp))
+       args.txq_size = tmp;
+      else if (unformat (i, "num-rx-queues %u", &tmp))
+       args.rxq_num = tmp;
       else
        {
          clib_warning ("unknown input '%U'", format_unformat_error, i);
@@ -125,6 +127,7 @@ api_avf_create (vat_main_t * vam)
 
   mp->pci_addr = clib_host_to_net_u32 (args.addr.as_u32);
   mp->enable_elog = clib_host_to_net_u16 (args.enable_elog);
+  mp->rxq_num = clib_host_to_net_u16 (args.rxq_num);
   mp->rxq_size = clib_host_to_net_u16 (args.rxq_size);
   mp->txq_size = clib_host_to_net_u16 (args.txq_size);
 
@@ -134,6 +137,24 @@ api_avf_create (vat_main_t * vam)
   return ret;
 }
 
+/* avf-create reply handler */
+static void
+vl_api_avf_create_reply_t_handler (vl_api_avf_create_reply_t * mp)
+{
+  vat_main_t *vam = avf_test_main.vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (retval == 0)
+    {
+      fformat (vam->ofp, "created avf with sw_if_index %d\n",
+              ntohl (mp->sw_if_index));
+    }
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+  vam->regenerate_interface_table = 1;
+}
+
 /* avf delete API */
 static int
 api_avf_delete (vat_main_t * vam)
@@ -177,11 +198,11 @@ api_avf_delete (vat_main_t * vam)
  */
 #define foreach_vpe_api_msg                                    \
 _(avf_create, "<pci-address> [rx-queue-size <size>] "          \
-              "[tx-queue-size <size>]")                                \
+              "[tx-queue-size <size>] [num-rx-queues <size>]") \
 _(avf_delete, "<sw_if_index>")
 
 static void
-avf_vat_api_hookup (vat_main_t * vam)
+avf_api_hookup (vat_main_t * vam)
 {
   avf_test_main_t *avm __attribute__ ((unused)) = &avf_test_main;
 #define _(N,n)                                                  \
@@ -205,24 +226,7 @@ avf_vat_api_hookup (vat_main_t * vam)
 #undef _
 }
 
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
-  avf_test_main_t *avm = &avf_test_main;
-  u8 *name;
-
-  avm->vat_main = vam;
-
-  name = format (0, "avf_%08x%c", api_version, 0);
-  avm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (avm->msg_id_base != (u16) ~ 0)
-    avf_vat_api_hookup (vam);
-
-  vec_free (name);
-
-  return 0;
-}
+VAT_PLUGIN_REGISTER (avf);
 
 /*
  * fd.io coding-style-patch-verification: ON