diff options
Diffstat (limited to 'src/plugins/vhost')
| -rw-r--r-- | src/plugins/vhost/vhost_user.c | 19 | ||||
| -rw-r--r-- | src/plugins/vhost/vhost_user.h | 2 | ||||
| -rw-r--r-- | src/plugins/vhost/vhost_user_api.c | 4 | ||||
| -rw-r--r-- | src/plugins/vhost/vhost_user_inline.h | 2 | ||||
| -rw-r--r-- | src/plugins/vhost/vhost_user_input.c | 2 | ||||
| -rw-r--r-- | src/plugins/vhost/vhost_user_output.c | 2 |
6 files changed, 0 insertions, 31 deletions
diff --git a/src/plugins/vhost/vhost_user.c b/src/plugins/vhost/vhost_user.c index fac20800848..fdee984f97b 100644 --- a/src/plugins/vhost/vhost_user.c +++ b/src/plugins/vhost/vhost_user.c @@ -52,7 +52,6 @@ vlib_node_registration_t vhost_user_send_interrupt_node; -/* *INDENT-OFF* */ vhost_user_main_t vhost_user_main = { .mtu_bytes = 1518, }; @@ -60,7 +59,6 @@ vhost_user_main_t vhost_user_main = { VNET_HW_INTERFACE_CLASS (vhost_interface_class, static) = { .name = "vhost-user", }; -/* *INDENT-ON* */ static long get_huge_page_size (int fd) @@ -1193,12 +1191,10 @@ vhost_user_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (vhost_user_init) = { .runs_after = VLIB_INITS("ip4_init"), }; -/* *INDENT-ON* */ static uword vhost_user_send_interrupt_process (vlib_main_t * vm, @@ -1244,7 +1240,6 @@ vhost_user_send_interrupt_process (vlib_main_t * vm, /* fall through */ case ~0: - /* *INDENT-OFF* */ pool_foreach (vui, vum->vhost_user_interfaces) { next_timeout = timeout; FOR_ALL_VHOST_RX_TXQ (qid, vui) @@ -1265,7 +1260,6 @@ vhost_user_send_interrupt_process (vlib_main_t * vm, timeout = next_timeout; } } - /* *INDENT-ON* */ break; default: @@ -1281,13 +1275,11 @@ vhost_user_send_interrupt_process (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vhost_user_send_interrupt_node) = { .function = vhost_user_send_interrupt_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "vhost-user-send-interrupt-process", }; -/* *INDENT-ON* */ static uword vhost_user_process (vlib_main_t * vm, @@ -1314,7 +1306,6 @@ vhost_user_process (vlib_main_t * vm, timeout = 3.0; - /* *INDENT-OFF* */ pool_foreach (vui, vum->vhost_user_interfaces) { if (vui->unix_server_index == ~0) { //Nothing to do for server sockets @@ -1386,18 +1377,15 @@ vhost_user_process (vlib_main_t * vm, } } } - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vhost_user_process_node,static) = { .function = vhost_user_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "vhost-user-process", }; -/* *INDENT-ON* */ /** * Disables and reset interface structure. @@ -1507,11 +1495,9 @@ vhost_user_exit (vlib_main_t * vm) vhost_user_intf_t *vui; vlib_worker_thread_barrier_sync (vlib_get_main ()); - /* *INDENT-OFF* */ pool_foreach (vui, vum->vhost_user_interfaces) { vhost_user_delete_if (vnm, vm, vui->sw_if_index); } - /* *INDENT-ON* */ vlib_worker_thread_barrier_release (vlib_get_main ()); return 0; } @@ -2393,7 +2379,6 @@ done: * Once the vHost interface is created, enable the interface using: * @cliexcmd{set interface state VirtualEthernet0/0/0 up} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vhost_user_connect_command, static) = { .path = "create vhost-user", .short_help = "create vhost-user socket <socket-filename> [server] " @@ -2402,7 +2387,6 @@ VLIB_CLI_COMMAND (vhost_user_connect_command, static) = { .function = vhost_user_connect_command_fn, .is_mp_safe = 1, }; -/* *INDENT-ON* */ /*? * Delete a vHost User interface using the interface name or the @@ -2416,7 +2400,6 @@ VLIB_CLI_COMMAND (vhost_user_connect_command, static) = { * Example of how to delete a vhost interface by software interface index: * @cliexcmd{delete vhost-user sw_if_index 1} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (vhost_user_delete_command, static) = { .path = "delete vhost-user", .short_help = "delete vhost-user {<interface> | sw_if_index <sw_idx>}", @@ -2557,14 +2540,12 @@ VLIB_CLI_COMMAND (vhost_user_delete_command, static) = { * @cliexend * @endparblock ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_vhost_user_command, static) = { .path = "show vhost-user", .short_help = "show vhost-user [<interface> [<interface> [..]]] " "[[descriptors] [verbose]]", .function = show_vhost_user_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * diff --git a/src/plugins/vhost/vhost_user.h b/src/plugins/vhost/vhost_user.h index 3479d65cbc6..a3582affb4b 100644 --- a/src/plugins/vhost/vhost_user.h +++ b/src/plugins/vhost/vhost_user.h @@ -122,7 +122,6 @@ int vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm, int vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm, u32 sw_if_index); -/* *INDENT-OFF* */ typedef struct vhost_user_memory_region { u64 guest_phys_addr; @@ -175,7 +174,6 @@ typedef struct vhost_user_msg { vhost_user_log_t log; }; } __attribute ((packed)) vhost_user_msg_t; -/* *INDENT-ON* */ typedef struct { diff --git a/src/plugins/vhost/vhost_user_api.c b/src/plugins/vhost/vhost_user_api.c index 3b0840a1b1b..33447c556a8 100644 --- a/src/plugins/vhost/vhost_user_api.c +++ b/src/plugins/vhost/vhost_user_api.c @@ -90,12 +90,10 @@ vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp) } } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void @@ -190,12 +188,10 @@ vl_api_create_vhost_user_if_v2_t_handler (vl_api_create_vhost_user_if_v2_t * } } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_V2_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); - /* *INDENT-ON* */ } static void diff --git a/src/plugins/vhost/vhost_user_inline.h b/src/plugins/vhost/vhost_user_inline.h index 8bdff3733a7..e27f819e96d 100644 --- a/src/plugins/vhost/vhost_user_inline.h +++ b/src/plugins/vhost/vhost_user_inline.h @@ -135,13 +135,11 @@ vhost_map_guest_mem_done: } } #endif - /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (el) = { .format = "failed to map guest mem addr %lx", .format_args = "i8", }; - /* *INDENT-ON* */ struct { uword addr; diff --git a/src/plugins/vhost/vhost_user_input.c b/src/plugins/vhost/vhost_user_input.c index c083f43ba7c..ca5072485ff 100644 --- a/src/plugins/vhost/vhost_user_input.c +++ b/src/plugins/vhost/vhost_user_input.c @@ -1447,7 +1447,6 @@ VLIB_NODE_FN (vhost_user_input_node) (vlib_main_t * vm, return n_rx_packets; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vhost_user_input_node) = { .type = VLIB_NODE_TYPE_INPUT, .name = "vhost-user-input", @@ -1463,7 +1462,6 @@ VLIB_REGISTER_NODE (vhost_user_input_node) = { .n_errors = VHOST_USER_INPUT_FUNC_N_ERROR, .error_strings = vhost_user_input_func_error_strings, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/vhost/vhost_user_output.c b/src/plugins/vhost/vhost_user_output.c index 9b52fc6265c..58fd4309f8c 100644 --- a/src/plugins/vhost/vhost_user_output.c +++ b/src/plugins/vhost/vhost_user_output.c @@ -1122,7 +1122,6 @@ vhost_user_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, return /* no error */ 0; } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (vhost_user_device_class) = { .name = "vhost-user", .tx_function_n_errors = VHOST_USER_TX_FUNC_N_ERROR, @@ -1134,7 +1133,6 @@ VNET_DEVICE_CLASS (vhost_user_device_class) = { .format_tx_trace = format_vhost_trace, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON |