From 12f4cd951aa9e74fd1b11831bde61694781b89fb Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Tue, 28 Jan 2020 11:50:51 +0000
Subject: [PATCH] tests: Use "--disks" for vhost-user-block testing

Use newly unified command line options for testing vhost-user based
block support.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 src/main.rs | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 5c5c01e92..acdb20a08 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -2771,16 +2771,13 @@ mod tests {
                         guest.disk_config.disk(DiskType::CloudInit).unwrap()
                     )
                     .as_str(),
-                ])
-                .args(&["--net", guest.default_net_string().as_str()])
-                .args(&[
-                    "--vhost-user-blk",
                     format!(
-                        "sock={},num_queues=1,queue_size=128,wce=true",
+                        "vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
                         vubd_socket_path
                     )
                     .as_str(),
                 ])
+                .args(&["--net", guest.default_net_string().as_str()])
                 .spawn()
                 .unwrap();
 
@@ -2855,16 +2852,13 @@ mod tests {
                         guest.disk_config.disk(DiskType::CloudInit).unwrap()
                     )
                     .as_str(),
-                ])
-                .args(&["--net", guest.default_net_string().as_str()])
-                .args(&[
-                    "--vhost-user-blk",
                     format!(
-                        "sock={},num_queues=1,queue_size=128,wce=true",
+                        "vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
                         vubd_socket_path
                     )
                     .as_str(),
                 ])
+                .args(&["--net", guest.default_net_string().as_str()])
                 .spawn()
                 .unwrap();
 
@@ -2932,16 +2926,13 @@ mod tests {
                         guest.disk_config.disk(DiskType::CloudInit).unwrap()
                     )
                     .as_str(),
-                ])
-                .args(&["--net", guest.default_net_string().as_str()])
-                .args(&[
-                    "--vhost-user-blk",
                     format!(
-                        "sock={},num_queues=1,queue_size=128,wce=true",
+                        "vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
                         vubd_socket_path
                     )
                     .as_str(),
                 ])
+                .args(&["--net", guest.default_net_string().as_str()])
                 .spawn()
                 .unwrap();
 
@@ -3000,16 +2991,13 @@ mod tests {
                         guest.disk_config.disk(DiskType::CloudInit).unwrap()
                     )
                     .as_str(),
-                ])
-                .args(&["--net", guest.default_net_string().as_str()])
-                .args(&[
-                    "--vhost-user-blk",
                     format!(
-                        "sock={},num_queues=1,queue_size=128,wce=true",
+                        "vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
                         vubd_socket_path
                     )
                     .as_str(),
                 ])
+                .args(&["--net", guest.default_net_string().as_str()])
                 .spawn()
                 .unwrap();