summaryrefslogtreecommitdiffstats
path: root/src/plugins/vmxnet3/vmxnet3_test.c
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-09-30 11:19:28 +0200
committerNeale Ranns <nranns@cisco.com>2019-09-30 15:32:17 +0000
commit10bbfce0264249354f14243fbc166ee0beb41366 (patch)
treed90e22bc4f9af37e7964b80dc5f6afce9ad15aa5 /src/plugins/vmxnet3/vmxnet3_test.c
parent0d935531f9d25b18af85a14195665db324e834d8 (diff)
vmxnet3: remove api boilerplate
Type: refactor Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: I009e806997461ad790f125d6359993862e1c5e5d
Diffstat (limited to 'src/plugins/vmxnet3/vmxnet3_test.c')
-rw-r--r--src/plugins/vmxnet3/vmxnet3_test.c118
1 files changed, 4 insertions, 114 deletions
diff --git a/src/plugins/vmxnet3/vmxnet3_test.c b/src/plugins/vmxnet3/vmxnet3_test.c
index 987026e3878..0d991a301a5 100644
--- a/src/plugins/vmxnet3/vmxnet3_test.c
+++ b/src/plugins/vmxnet3/vmxnet3_test.c
@@ -31,34 +31,9 @@
#include <vlibapi/vat_helper_macros.h>
/* declare message IDs */
-#include <vmxnet3/vmxnet3_msg_enum.h>
-
-/* Get CRC codes of the messages defined outside of this plugin */
-#define vl_msg_name_crc_list
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-/* define message structures */
-#define vl_typedefs
-#include <vpp/api/vpe_all_api_h.h>
-#include <vmxnet3/vmxnet3_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-#define vl_endianfun
-#include <vmxnet3/vmxnet3_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vmxnet3/vmxnet3_all_api_h.h>
-#undef vl_printfun
-
-/* get API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <vmxnet3/vmxnet3_all_api_h.h>
-#undef vp_api_version
+#include <vmxnet3/vmxnet3.api_enum.h>
+#include <vmxnet3/vmxnet3.api_types.h>
+#include <vpp/api/vpe.api_types.h>
typedef struct
{
@@ -70,30 +45,6 @@ typedef struct
vmxnet3_test_main_t vmxnet3_test_main;
-#define foreach_standard_reply_retval_handler \
-_(vmxnet3_delete_reply)
-
-#define _(n) \
- static void vl_api_##n##_t_handler \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = vmxnet3_test_main.vat_main; \
- i32 retval = ntohl(mp->retval); \
- if (vam->async_mode) { \
- vam->async_errors += (retval < 0); \
- } else { \
- vam->retval = retval; \
- vam->result_ready = 1; \
- } \
- }
-foreach_standard_reply_retval_handler;
-#undef _
-
-#define foreach_vpe_api_reply_msg \
-_(VMXNET3_CREATE_REPLY, vmxnet3_create_reply) \
-_(VMXNET3_DELETE_REPLY, vmxnet3_delete_reply) \
-_(VMXNET3_DETAILS, vmxnet3_details)
-
/* vmxnet3 create API */
static int
api_vmxnet3_create (vat_main_t * vam)
@@ -287,68 +238,7 @@ vl_api_vmxnet3_details_t_handler (vl_api_vmxnet3_details_t * mp)
}
}
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(vmxnet3_create, "<pci-address> [rx-queue-size <size>] " \
- "[tx-queue-size <size>] [num-tx-queues <num>]" \
- "[num-rx-queues <num>] [bind] [gso]") \
-_(vmxnet3_delete, "sw_if_index <sw_if_index>") \
-_(vmxnet3_dump, "")
-
-static void
-vmxnet3_vat_api_hookup (vat_main_t * vam)
-{
- vmxnet3_test_main_t *vxm __attribute__ ((unused)) = &vmxnet3_test_main;
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + vxm->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_vpe_api_reply_msg;
-#undef _
-
-#define _(n,h) \
- hash_set_mem (vam->function_by_name, #n, api_##n);
- foreach_vpe_api_msg;
-#undef _
-
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
- foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
- vmxnet3_test_main_t *vxm = &vmxnet3_test_main;
- u8 *name;
-
- vxm->vat_main = vam;
-
- name = format (0, "vmxnet3_%08x%c", api_version, 0);
- vxm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
- vec_free (name);
-
- if (vxm->msg_id_base == (u16) ~ 0)
- return clib_error_return (0, "vmxnet3 plugin not loaded...");
-
- /* Get the control ping ID */
-#define _(id,n,crc) \
- const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc;
- foreach_vl_msg_name_crc_vpe;
-#undef _
- vxm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC));
-
- vmxnet3_vat_api_hookup (vam);
-
- return 0;
-}
+#include <vmxnet3/vmxnet3.api_test.c>
/*
* fd.io coding-style-patch-verification: ON