virtio: Minor fixes and header cleanup

Change-Id: I2e5fd45abcd07e9eda6184587889bdcd9613a159
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
diff --git a/src/vnet/devices/virtio/virtio_api.c b/src/vnet/devices/virtio/virtio_api.c
index 6f70b09..5035799 100644
--- a/src/vnet/devices/virtio/virtio_api.c
+++ b/src/vnet/devices/virtio/virtio_api.c
@@ -108,7 +108,7 @@
 {
   vnet_main_t *vnm = vnet_get_main ();
   vlib_main_t *vm = vlib_get_main ();
-  virtio_main_t *vmx = &virtio_main;
+  virtio_main_t *vim = &virtio_main;
   int rv = 0;
   vnet_hw_interface_t *hw;
   virtio_if_t *vif;
@@ -124,7 +124,7 @@
       goto reply;
     }
 
-  vif = pool_elt_at_index (vmx->interfaces, hw->dev_instance);
+  vif = pool_elt_at_index (vim->interfaces, hw->dev_instance);
 
   rv = virtio_pci_delete_if (vm, vif);