Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vhost: convert vhost device driver to a plugin
[vpp.git]
/
src
/
plugins
/
vhost
/
vhost_user_api.c
diff --git
a/src/vnet/devices/virtio/vhost_user_api.c
b/src/plugins/vhost/vhost_user_api.c
similarity index 96%
rename from
src/vnet/devices/virtio/vhost_user_api.c
rename to
src/plugins/vhost/vhost_user_api.c
index
cc1896b
..
d522803
100644
(file)
--- a/
src/vnet/devices/virtio/vhost_user_api.c
+++ b/
src/plugins/vhost/vhost_user_api.c
@@
-22,14
+22,13
@@
#include <vnet/interface.h>
#include <vnet/api_errno.h>
#include <vnet/interface.h>
#include <vnet/api_errno.h>
-#include <v
net/devices/virtio
/vhost_user.h>
+#include <v
host
/vhost_user.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/ethernet/ethernet_types_api.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/ethernet/ethernet_types_api.h>
-#include <vnet/devices/virtio/virtio_types_api.h>
#include <vnet/format_fns.h>
#include <vnet/format_fns.h>
-#include <v
net/devices/virtio
/vhost_user.api_enum.h>
-#include <v
net/devices/virtio
/vhost_user.api_types.h>
+#include <v
host
/vhost_user.api_enum.h>
+#include <v
host
/vhost_user.api_types.h>
#define REPLY_MSG_ID_BASE msg_id_base
#include <vlibapi/api_helper_macros.h>
#define REPLY_MSG_ID_BASE msg_id_base
#include <vlibapi/api_helper_macros.h>
@@
-260,6
+259,13
@@
vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp)
}
}
}
}
+static void
+vhost_user_features_encode (u64 features, u32 *first, u32 *last)
+{
+ *first = clib_net_to_host_u32 (features);
+ *last = clib_net_to_host_u32 (features >> 32);
+}
+
static void
send_sw_interface_vhost_user_details (vpe_api_main_t * am,
vl_api_registration_t * reg,
static void
send_sw_interface_vhost_user_details (vpe_api_main_t * am,
vl_api_registration_t * reg,
@@
-274,8
+280,8
@@
send_sw_interface_vhost_user_details (vpe_api_main_t * am,
ntohs (REPLY_MSG_ID_BASE + VL_API_SW_INTERFACE_VHOST_USER_DETAILS);
mp->sw_if_index = ntohl (vui->sw_if_index);
mp->virtio_net_hdr_sz = ntohl (vui->virtio_net_hdr_sz);
ntohs (REPLY_MSG_ID_BASE + VL_API_SW_INTERFACE_VHOST_USER_DETAILS);
mp->sw_if_index = ntohl (vui->sw_if_index);
mp->virtio_net_hdr_sz = ntohl (vui->virtio_net_hdr_sz);
- v
irtio_features_encode (vui->features, (u32 *) &
mp->features_first_32,
-
(u32 *) &
mp->features_last_32);
+ v
host_user_features_encode (vui->features, (u32 *) &
mp->features_first_32,
+
(u32 *) &
mp->features_last_32);
mp->is_server = vui->is_server;
mp->num_regions = ntohl (vui->num_regions);
mp->sock_errno = ntohl (vui->sock_errno);
mp->is_server = vui->is_server;
mp->num_regions = ntohl (vui->num_regions);
mp->sock_errno = ntohl (vui->sock_errno);
@@
-324,7
+330,7
@@
static void
vec_free (ifaces);
}
vec_free (ifaces);
}
-#include <v
net/devices/virtio
/vhost_user.api.c>
+#include <v
host
/vhost_user.api.c>
static clib_error_t *
vhost_user_api_hookup (vlib_main_t * vm)
{
static clib_error_t *
vhost_user_api_hookup (vlib_main_t * vm)
{