aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-03-04 03:03:13 -0800
committerDamjan Marion <dmarion@me.com>2019-03-04 14:06:18 +0000
commit608996d2bdaa0846ce490252fb8579b70350391e (patch)
treea318f61c132402bd770e6f0b1275f8946f442625
parent7693ca524990d3779a44ec36820fe9c0c19eeb92 (diff)
devices: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: I911fb3f1c6351b37580c5dbde6939a549431a92d Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
-rw-r--r--src/vnet/CMakeLists.txt3
-rw-r--r--src/vnet/devices/af_packet/node.c9
-rw-r--r--src/vnet/devices/netmap/node.c9
-rw-r--r--src/vnet/devices/virtio/node.c9
4 files changed, 12 insertions, 18 deletions
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index 1c2ab2d9958..6af466fddf9 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -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
diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
index 2aa52e06a62..3c91c981618 100644
--- a/src/vnet/devices/af_packet/node.c
+++ b/src/vnet/devices/af_packet/node.c
@@ -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* */
diff --git a/src/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c
index 9293c0d811f..00e31c0c1a2 100644
--- a/src/vnet/devices/netmap/node.c
+++ b/src/vnet/devices/netmap/node.c
@@ -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* */
diff --git a/src/vnet/devices/virtio/node.c b/src/vnet/devices/virtio/node.c
index fcc0f8a212a..b2f8d04861e 100644
--- a/src/vnet/devices/virtio/node.c
+++ b/src/vnet/devices/virtio/node.c
@@ -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* */
/*