From c3eaa41b77aaa87c2be7c9278c3d2523c1479ec3 Mon Sep 17 00:00:00 2001
From: Sergio Lopez <slp@redhat.com>
Date: Thu, 24 Oct 2019 14:31:03 -0400
Subject: [PATCH] ci: use the new vhost-user-blk backend for integration tests

Use the new vhost-user-blk backend for the integration tests,
eliminating the need for building vubd using the implementation in
QEMU.

Signed-off-by: Sergio Lopez <slp@redhat.com>
---
 scripts/run_integration_tests.sh |  6 ++----
 src/main.rs                      | 12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
index 271467ace..0eb163b91 100755
--- a/scripts/run_integration_tests.sh
+++ b/scripts/run_integration_tests.sh
@@ -88,16 +88,14 @@ if [ ! -f "$VMLINUX_IMAGE" ]; then
 fi
 
 VIRTIOFSD="$WORKLOADS_DIR/virtiofsd"
-VUBD="$WORKLOADS_DIR/vubd"
 QEMU_DIR="qemu_build"
-if [ ! -f "$VIRTIOFSD" ] || [ ! -f "$VUBD" ]; then
+if [ ! -f "$VIRTIOFSD" ]; then
     pushd $WORKLOADS_DIR
     git clone --depth 1 "https://github.com/sboeuf/qemu.git" -b "virtio-fs" $QEMU_DIR
     pushd $QEMU_DIR
     ./configure --prefix=$PWD --target-list=x86_64-softmmu
-    make virtiofsd vhost-user-blk -j `nproc`
+    make virtiofsd -j `nproc`
     cp virtiofsd $VIRTIOFSD
-    cp vhost-user-blk $VUBD
     popd
     rm -rf $QEMU_DIR
     sudo setcap cap_dac_override,cap_sys_admin+epi "virtiofsd"
diff --git a/src/main.rs b/src/main.rs
index aac2cd512..b50e65b74 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -709,10 +709,6 @@ mod tests {
         let mut workload_path = dirs::home_dir().unwrap();
         workload_path.push("workloads");
 
-        let mut vubd_path = workload_path.clone();
-        vubd_path.push("vubd");
-        let vubd_path = String::from(vubd_path.to_str().unwrap());
-
         let mut blk_file_path = workload_path.clone();
         blk_file_path.push(blk_img);
         let blk_file_path = String::from(blk_file_path.to_str().unwrap());
@@ -720,9 +716,11 @@ mod tests {
         let vubd_socket_path = String::from(tmp_dir.path().join("vub.sock").to_str().unwrap());
 
         // Start the daemon
-        let child = Command::new(vubd_path.as_str())
-            .args(&["-b", blk_file_path.as_str()])
-            .args(&["-s", vubd_socket_path.as_str()])
+        let child = Command::new("target/release/vhost_user_blk")
+            .args(&[
+                "--backend",
+                format!("image={},sock={}", blk_file_path, vubd_socket_path).as_str(),
+            ])
             .spawn()
             .unwrap();