tests,vm-virtio,vmm: Use 'socket' for all CLI/API parameters

This patch unifies the inconsistent uses of 'socket' and 'sock' from our
CLI/API parameters.

Fixes: #1091

Signed-off-by: Bo Chen <chen.bo@intel.com>

vm-virtio/src/vhost_user/blk.rs

@@ -50,7 +50,7 @@ pub struct Blk {
 impl Blk {
     /// Create a new vhost-user-blk device
     pub fn new(id: String, vu_cfg: VhostUserConfig) -> Result<Blk> {
-        let mut vhost_user_blk = Master::connect(&vu_cfg.sock, vu_cfg.num_queues as u64)
+        let mut vhost_user_blk = Master::connect(&vu_cfg.socket, vu_cfg.num_queues as u64)
             .map_err(Error::VhostUserCreateMaster)?;
 
         // Filling device and vring features VMM supports.

vm-virtio/src/vhost_user/net.rs

@@ -56,7 +56,7 @@ impl Net {
     /// Create a new vhost-user-net device
     /// Create a new vhost-user-net device
     pub fn new(id: String, mac_addr: MacAddr, vu_cfg: VhostUserConfig) -> Result<Net> {
-        let mut vhost_user_net = Master::connect(&vu_cfg.sock, vu_cfg.num_queues as u64)
+        let mut vhost_user_net = Master::connect(&vu_cfg.socket, vu_cfg.num_queues as u64)
             .map_err(Error::VhostUserCreateMaster)?;
 
         // Filling device and vring features VMM supports.

vm-virtio/src/vhost_user/vu_common_ctrl.rs

@@ -18,7 +18,7 @@ use vmm_sys_util::eventfd::EventFd;
 
 #[derive(Debug, Clone)]
 pub struct VhostUserConfig {
-    pub sock: String,
+    pub socket: String,
     pub num_queues: usize,
     pub queue_size: u16,
 }