ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devices: migrate old MULTIARCH macros to VLIB_NODE_FN

Browse Source 
Change-Id: I911fb3f1c6351b37580c5dbde6939a549431a92d
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
This commit is contained in:
Filip Tehlar
2019-03-04 03:03:13 -08:00
committed by Damjan Marion
parent 7693ca5249
commit 608996d2bd
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vnet/CMakeLists.txt
View File

@ -992,6 +992,9 @@ list(APPEND VNET_HEADERS
list(APPEND VNET_MULTIARCH_SOURCES
devices/virtio/vhost_user_input.c
devices/virtio/vhost_user_output.c
devices/netmap/node.c
devices/virtio/node.c
devices/af_packet/node.c
)
list(APPEND VNET_API_FILES

9
src/vnet/devices/af_packet/node.c
View File

@ -345,9 +345,9 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
return n_rx_packets;
}
static uword
af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * frame)
VLIB_NODE_FN (af_packet_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
u32 n_rx_packets = 0;
af_packet_main_t *apm = &af_packet_main;
@ -367,7 +367,6 @@ af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (af_packet_input_node) = {
.function = af_packet_input_fn,
.name = "af-packet-input",
.sibling_of = "device-input",
.format_trace = format_af_packet_input_trace,
@ -376,8 +375,6 @@ VLIB_REGISTER_NODE (af_packet_input_node) = {
.n_errors = AF_PACKET_INPUT_N_ERROR,
.error_strings = af_packet_input_error_strings,
};
VLIB_NODE_FUNCTION_MULTIARCH (af_packet_input_node, af_packet_input_fn)
/* *INDENT-ON* */

9
src/vnet/devices/netmap/node.c
View File

@ -252,9 +252,9 @@ netmap_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
return n_rx_packets;
}
static uword
netmap_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * frame)
VLIB_NODE_FN (netmap_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
int i;
u32 n_rx_packets = 0;
@ -276,7 +276,6 @@ netmap_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (netmap_input_node) = {
.function = netmap_input_fn,
.name = "netmap-input",
.sibling_of = "device-input",
.format_trace = format_netmap_input_trace,
@ -286,8 +285,6 @@ VLIB_REGISTER_NODE (netmap_input_node) = {
.n_errors = NETMAP_INPUT_N_ERROR,
.error_strings = netmap_input_error_strings,
};
VLIB_NODE_FUNCTION_MULTIARCH (netmap_input_node, netmap_input_fn)
/* *INDENT-ON* */

9
src/vnet/devices/virtio/node.c
View File

@ -353,9 +353,9 @@ refill:
return n_rx_packets;
}
static uword
virtio_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * frame)
VLIB_NODE_FN (virtio_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
u32 n_rx = 0;
virtio_main_t *nm = &virtio_main;
@ -382,7 +382,6 @@ virtio_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (virtio_input_node) = {
.function = virtio_input_fn,
.name = "virtio-input",
.sibling_of = "device-input",
.format_trace = format_virtio_input_trace,
@ -391,8 +390,6 @@ VLIB_REGISTER_NODE (virtio_input_node) = {
.n_errors = VIRTIO_INPUT_N_ERROR,
.error_strings = virtio_input_error_strings,
};
VLIB_NODE_FUNCTION_MULTIARCH (virtio_input_node, virtio_input_fn)
/* *INDENT-ON* */
/*