From 277f03f0673b4be5db0f0eb8b3ed0e63855dbac7 Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Fri, 6 Dec 2019 14:55:38 +0100
Subject: [PATCH] vmxnet3: use explicit types in api

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I2e699fc812c45f88e359f0f7231f372955e70149
---
 src/plugins/vmxnet3/vmxnet3.api    | 18 ++++++++++--------
 src/plugins/vmxnet3/vmxnet3_api.c  |  2 +-
 src/plugins/vmxnet3/vmxnet3_test.c |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/plugins/vmxnet3/vmxnet3.api b/src/plugins/vmxnet3/vmxnet3.api
index 6c4a1774756..ff4bdf88f5c 100644
--- a/src/plugins/vmxnet3/vmxnet3.api
+++ b/src/plugins/vmxnet3/vmxnet3.api
@@ -15,7 +15,9 @@
  *------------------------------------------------------------------
  */
 
-option version = "1.0.1";
+option version = "1.1.0";
+import "vnet/interface_types.api";
+import "vnet/ethernet/ethernet_types.api";
 
 /** \brief
     @param client_index - opaque cookie to identify the sender
@@ -45,7 +47,7 @@ define vmxnet3_create
   u16 txq_size;
   u16 txq_num;
   u8 bind;
-  u8 enable_gso;
+  bool enable_gso;
   option vat_help = "<pci-address> [rx-queue-size <size>] [tx-queue-size <size>] [num-tx-queues <num>] [num-rx-queues <num>] [bind] [gso]";
 };
 
@@ -59,7 +61,7 @@ define vmxnet3_create_reply
 {
   u32 context;
   i32 retval;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
 };
 
 /** \brief
@@ -73,7 +75,7 @@ autoreply define vmxnet3_delete
   u32 client_index;
   u32 context;
 
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
   option vat_help = "sw_if_index <sw_if_index>";
 };
 
@@ -126,12 +128,12 @@ define vmxnet3_details
 {
   u32 context;
 
-  u32 sw_if_index;
-  u8 if_name[64];
-  u8 hw_addr[6];
+  vl_api_interface_index_t sw_if_index;
+  string if_name[64];
+  vl_api_mac_address_t hw_addr;
   u32 pci_addr;
   u8 version;
-  u8 admin_up_down;
+  bool admin_up_down;
 
   u8 rx_count;
   vl_api_vmxnet3_rx_list_t rx_list[16];
diff --git a/src/plugins/vmxnet3/vmxnet3_api.c b/src/plugins/vmxnet3/vmxnet3_api.c
index fa7554e3301..cdb68708f57 100644
--- a/src/plugins/vmxnet3/vmxnet3_api.c
+++ b/src/plugins/vmxnet3/vmxnet3_api.c
@@ -19,7 +19,7 @@
 #include <vlib/unix/unix.h>
 #include <vlib/pci/pci.h>
 #include <vnet/ethernet/ethernet.h>
-
+#include <vnet/format_fns.h>
 #include <vmxnet3/vmxnet3.h>
 
 #include <vlibapi/api.h>
diff --git a/src/plugins/vmxnet3/vmxnet3_test.c b/src/plugins/vmxnet3/vmxnet3_test.c
index 0d991a301a5..259ccdb6828 100644
--- a/src/plugins/vmxnet3/vmxnet3_test.c
+++ b/src/plugins/vmxnet3/vmxnet3_test.c
@@ -19,6 +19,7 @@
 #include <vlib/unix/unix.h>
 #include <vlib/pci/pci.h>
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/format_fns.h>
 
 #include <vat/vat.h>
 #include <vlibapi/api.h>
-- 
2.16.6