virtio: remove configurable queue size support

[vpp.git] / src / vnet / devices / virtio / cli.c

diff --git a/src/vnet/devices/virtio/cli.c b/src/vnet/devices/virtio/cli.c
index 82dc5a1..956284c 100644 (file)
--- a/src/vnet/devices/virtio/cli.c
+++ b/src/vnet/devices/virtio/cli.c
@@ -14,11 +14,6 @@
  * limitations under the License.
  *------------------------------------------------------------------
  */
-#include <stdint.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-#include <inttypes.h>
-
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
 #include <vlib/pci/pci.h>
@@ -34,7 +29,6 @@ virtio_pci_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 {
   unformat_input_t _line_input, *line_input = &_line_input;
   virtio_pci_create_if_args_t args;
-  u32 tmp;
   u64 feature_mask = (u64) ~ (0ULL);
 
   /* Get a line of input. */
@@ -48,10 +42,6 @@ virtio_pci_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
        ;
       else if (unformat (line_input, "feature-mask 0x%llx", &feature_mask))
        args.features = feature_mask;
-      else if (unformat (line_input, "rx-queue-size %u", &tmp))
-       args.rxq_size = tmp;
-      else if (unformat (line_input, "tx-queue-size %u", &tmp))
-       args.txq_size = tmp;
       else
        return clib_error_return (0, "unknown input `%U'",
                                  format_unformat_error, input);
@@ -66,8 +56,8 @@ virtio_pci_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (virtio_pci_create_command, static) = {
   .path = "create interface virtio",
-  .short_help = "create interface virtio <pci-address>"
-                "[feature-mask <hex-mask>] [rx-queue-size <size>] [tx-queue-size <size>]",
+  .short_help = "create interface virtio <pci-address> "
+                "[feature-mask <hex-mask>]",
   .function = virtio_pci_create_command_fn,
 };
 /* *INDENT-ON* */
@@ -79,7 +69,7 @@ virtio_pci_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
   unformat_input_t _line_input, *line_input = &_line_input;
   u32 sw_if_index = ~0;
   vnet_hw_interface_t *hw;
-  virtio_main_t *vmxm = &virtio_main;
+  virtio_main_t *vim = &virtio_main;
   virtio_if_t *vif;
   vnet_main_t *vnm = vnet_get_main ();
 
@@ -108,7 +98,7 @@ virtio_pci_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
   if (hw == NULL || virtio_device_class.index != hw->dev_class_index)
     return clib_error_return (0, "not a virtio interface");
 
-  vif = pool_elt_at_index (vmxm->interfaces, hw->dev_instance);
+  vif = pool_elt_at_index (vim->interfaces, hw->dev_instance);
 
   if (virtio_pci_delete_if (vm, vif) < 0)
     return clib_error_return (0, "not a virtio pci interface");
@@ -119,7 +109,7 @@ virtio_pci_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (virtio_pci_delete_command, static) = {
   .path = "delete interface virtio",
-  .short_help = "delete interface virtio"
+  .short_help = "delete interface virtio "
     "{<interface> | sw_if_index <sw_idx>}",
   .function = virtio_pci_delete_command_fn,
 };
@@ -129,7 +119,7 @@ static clib_error_t *
 show_virtio_pci_fn (vlib_main_t * vm, unformat_input_t * input,
                    vlib_cli_command_t * cmd)
 {
-  virtio_main_t *vmxm = &virtio_main;
+  virtio_main_t *vim = &virtio_main;
   vnet_main_t *vnm = &vnet_main;
   virtio_if_t *vif;
   clib_error_t *error = 0;
@@ -165,13 +155,13 @@ show_virtio_pci_fn (vlib_main_t * vm, unformat_input_t * input,
 
   if (vec_len (hw_if_indices) == 0)
     {
-      pool_foreach (vif, vmxm->interfaces,
+      pool_foreach (vif, vim->interfaces,
                    vec_add1 (hw_if_indices, vif->hw_if_index);
        );
     }
   else if (show_device_config)
     {
-      vif = pool_elt_at_index (vmxm->interfaces, hi->dev_instance);
+      vif = pool_elt_at_index (vim->interfaces, hi->dev_instance);
       if (vif->type == VIRTIO_IF_TYPE_PCI)
        debug_device_config_space (vm, vif);
     }
@@ -194,6 +184,8 @@ VLIB_CLI_COMMAND (show_virtio_pci_command, static) = {
 clib_error_t *
 virtio_pci_cli_init (vlib_main_t * vm)
 {
+  virtio_main_t *vim = &virtio_main;
+  vim->log_default = vlib_log_register_class ("virtio-pci", 0);
   return 0;
 }