3 files changed, 5 insertions, 55 deletions
diff --git a/src/vnet/devices/af_packet/af_packet.api b/src/vnet/devices/af_packet/af_packet.api
index 9fb2a2070f2..8d40ad60c02 100644
--- a/src/vnet/devices/af_packet/af_packet.api
+++ b/src/vnet/devices/af_packet/af_packet.api
@@ -46,7 +46,7 @@ define af_packet_create_reply
     @param context - sender context, to match reply w/ request
     @param host_if_name - interface name
 */
-define af_packet_delete
+autoreply define af_packet_delete
 {
   u32 client_index;
   u32 context;
@@ -54,16 +54,6 @@ define af_packet_delete
   u8 host_if_name[64];
 };
 
-/** \brief Delete host-interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define af_packet_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/devices/netmap/netmap.api b/src/vnet/devices/netmap/netmap.api
index 377ccffda4c..8dc698b999b 100644
--- a/src/vnet/devices/netmap/netmap.api
+++ b/src/vnet/devices/netmap/netmap.api
@@ -22,7 +22,7 @@
     @param is_pipe - is pipe
     @param is_master - 0=slave, 1=master
 */
-define netmap_create
+autoreply define netmap_create
 {
   u32 client_index;
   u32 context;
@@ -34,22 +34,12 @@ define netmap_create
   u8 is_master;
 };
 
-/** \brief Create netmap response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define netmap_create_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Delete netmap
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param netmap_if_name - interface name
 */
-define netmap_delete
+autoreply define netmap_delete
 {
   u32 client_index;
   u32 context;
@@ -57,16 +47,6 @@ define netmap_delete
   u8 netmap_if_name[64];
 };
 
-/** \brief Delete netmap response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define netmap_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/devices/virtio/vhost_user.api b/src/vnet/devices/virtio/vhost_user.api
index 4f604e45494..df7ce7abf2a 100644
--- a/src/vnet/devices/virtio/vhost_user.api
+++ b/src/vnet/devices/virtio/vhost_user.api
@@ -53,7 +53,7 @@ define create_vhost_user_if_reply
     @param sock_filename - unix socket filename, used to speak with frontend
     @param operation_mode - polling=0, interrupt=1, or adaptive=2
 */
-define modify_vhost_user_if
+autoreply define modify_vhost_user_if
 {
   u32 client_index;
   u32 context;
@@ -65,36 +65,16 @@ define modify_vhost_user_if
   u8 operation_mode;
 };
 
-/** \brief vhost-user interface modify response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define modify_vhost_user_if_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief vhost-user interface delete request
     @param client_index - opaque cookie to identify the sender
 */
-define delete_vhost_user_if
+autoreply define delete_vhost_user_if
 {
   u32 client_index;
   u32 context;
   u32 sw_if_index;
 };
 
-/** \brief vhost-user interface delete response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define delete_vhost_user_if_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Vhost-user interface details structure (fix this)
     @param sw_if_index - index of the interface
     @param interface_name - name of interface