diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2019-03-13 05:50:44 -0700 |
|---|---|---|
| committer | Filip Tehlar <ftehlar@cisco.com> | 2019-03-13 05:50:59 -0700 |
| commit | aee73648cf524f2627a8680ca26a68d6a2c8e164 (patch) | |
| tree | e2ad1f18593a6a606924b1735bb7200662d5eb3a /src/vnet/devices/virtio/device.c | |
| parent | 69becfcd5eaab90c99b63ca7f3de7ccad9fffc0a (diff) | |
deprecate VLIB_DEVICE_TX_FUNCTION_MULTIARCH
Change-Id: I8819bcb9e228e7a432f4a7b67b6107f984927cd4
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/devices/virtio/device.c')
| -rw-r--r-- | src/vnet/devices/virtio/device.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/vnet/devices/virtio/device.c b/src/vnet/devices/virtio/device.c index 609ffb47de8..dbf560688b8 100644 --- a/src/vnet/devices/virtio/device.c +++ b/src/vnet/devices/virtio/device.c @@ -46,6 +46,7 @@ static char *virtio_tx_func_error_strings[] = { #undef _ }; +#ifndef CLIB_MARCH_VARIANT u8 * format_virtio_device_name (u8 * s, va_list * args) { @@ -64,6 +65,7 @@ format_virtio_device_name (u8 * s, va_list * args) return s; } +#endif /* CLIB_MARCH_VARIANT */ static u8 * format_virtio_device (u8 * s, va_list * args) @@ -88,6 +90,7 @@ format_virtio_tx_trace (u8 * s, va_list * args) return s; } +#ifndef CLIB_MARCH_VARIANT inline void virtio_free_used_desc (vlib_main_t * vm, virtio_vring_t * vring) { @@ -113,6 +116,7 @@ virtio_free_used_desc (vlib_main_t * vm, virtio_vring_t * vring) vring->desc_in_use = used; vring->last_used_idx = last; } +#endif /* CLIB_MARCH_VARIANT */ static_always_inline u16 add_buffer_to_slot (vlib_main_t * vm, virtio_if_t * vif, @@ -299,9 +303,9 @@ virtio_interface_tx_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors - n_left; } -static uword -virtio_interface_tx (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VNET_DEVICE_CLASS_TX_FN (virtio_device_class) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { virtio_main_t *nm = &virtio_main; vnet_interface_output_runtime_t *rund = (void *) node->runtime_data; @@ -391,7 +395,6 @@ virtio_subif_add_del_function (vnet_main_t * vnm, /* *INDENT-OFF* */ VNET_DEVICE_CLASS (virtio_device_class) = { .name = "virtio", - .tx_function = virtio_interface_tx, .format_device_name = format_virtio_device_name, .format_device = format_virtio_device, .format_tx_trace = format_virtio_tx_trace, @@ -403,9 +406,6 @@ VNET_DEVICE_CLASS (virtio_device_class) = { .subif_add_del_function = virtio_subif_add_del_function, .rx_mode_change_function = virtio_interface_rx_mode_change, }; - -VLIB_DEVICE_TX_FUNCTION_MULTIARCH(virtio_device_class, - virtio_interface_tx) /* *INDENT-ON* */ /* |