X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Favf_api.c;h=1ddc45f23484875d84e7e1822ff424201872fb36;hb=1a7bb281f5e986cad792cf906643120488034db3;hp=8cb585ded2cc0a57f50188a10ba18fedc5eba753;hpb=149d0e2813c0777497f2e312a0e2a7eb0c07ac6c;p=vpp.git

diff --git a/src/plugins/avf/avf_api.c b/src/plugins/avf/avf_api.c
index 8cb585ded2c..1ddc45f2348 100644
--- a/src/plugins/avf/avf_api.c
+++ b/src/plugins/avf/avf_api.c
@@ -26,35 +26,11 @@
 #include <vlibmemory/api.h>
 
 /* define message IDs */
-#include <avf/avf_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <avf/avf_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <avf/avf_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <avf/avf_all_api_h.h>
-#undef vl_printfun
-
-/* get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <avf/avf_all_api_h.h>
-#undef vl_api_version
+#include <avf/avf.api_enum.h>
+#include <avf/avf.api_types.h>
 
 #include <vlibapi/api_helper_macros.h>
 
-#define foreach_avf_plugin_api_msg	\
-_(AVF_CREATE, avf_create)		\
-_(AVF_DELETE, avf_delete)
-
 static void
 vl_api_avf_create_t_handler (vl_api_avf_create_t * mp)
 {
@@ -64,7 +40,7 @@ vl_api_avf_create_t_handler (vl_api_avf_create_t * mp)
   avf_create_if_args_t args;
   int rv;
 
-  memset (&args, 0, sizeof (avf_create_if_args_t));
+  clib_memset (&args, 0, sizeof (avf_create_if_args_t));
 
   args.enable_elog = ntohl (mp->enable_elog);
   args.addr.as_u32 = ntohl (mp->pci_addr);
@@ -94,7 +70,9 @@ vl_api_avf_delete_t_handler (vl_api_avf_delete_t * mp)
   vnet_hw_interface_t *hw;
   int rv = 0;
 
-  hw = vnet_get_sup_hw_interface (vnm, htonl (mp->sw_if_index));
+  hw =
+    vnet_get_sup_hw_interface_api_visible_or_null (vnm,
+						   htonl (mp->sw_if_index));
   if (hw == NULL || avf_device_class.index != hw->dev_class_index)
     {
       rv = VNET_API_ERROR_INVALID_INTERFACE;
@@ -109,49 +87,15 @@ reply:
   REPLY_MACRO (VL_API_AVF_DELETE_REPLY + am->msg_id_base);
 }
 
-#define vl_msg_name_crc_list
-#include <avf/avf_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (avf_main_t * avm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + avm->msg_id_base);
-  foreach_vl_msg_name_crc_avf;
-#undef _
-}
-
 /* set tup the API message handling tables */
+#include <avf/avf.api.c>
 static clib_error_t *
 avf_plugin_api_hookup (vlib_main_t * vm)
 {
   avf_main_t *avm = &avf_main;
-  api_main_t *am = &api_main;
-  u8 *name;
-
-  /* construct the API name */
-  name = format (0, "avf_%08x%c", api_version, 0);
 
   /* ask for a correctly-sized block of API message decode slots */
-  avm->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-#define _(N,n)							\
-    vl_msg_api_set_handlers((VL_API_##N + avm->msg_id_base),	\
-			   #n,					\
-			   vl_api_##n##_t_handler,		\
-			   vl_noop_handler,			\
-			   vl_api_##n##_t_endian,		\
-			   vl_api_##n##_t_print,		\
-			   sizeof(vl_api_##n##_t), 1);
-  foreach_avf_plugin_api_msg;
-#undef _
-
-  /* set up the (msg_name, crc, message-id) table */
-  setup_message_id_table (avm, am);
-
-  vec_free (name);
+  avm->msg_id_base = setup_message_id_table ();
   return 0;
 }