From b73b932a51aee0999e3d76c6016d302837ce0a7e Mon Sep 17 00:00:00 2001
From: Rob Bradford <rbradford@rivosinc.com>
Date: Thu, 16 Nov 2023 15:59:37 +0000
Subject: [PATCH] tests: Bump version of CH used

Command line syntax has changed so this needs adapting.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
---
 scripts/fetch_images.sh | 2 +-
 src/integration.rs      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/fetch_images.sh b/scripts/fetch_images.sh
index b4fdbb1b..26a7594b 100755
--- a/scripts/fetch_images.sh
+++ b/scripts/fetch_images.sh
@@ -4,7 +4,7 @@ set -x
 fetch_ch() {
     CH_PATH="$1"
     CH_ARCH="$2"
-    CH_VERSION="v34.0"
+    CH_VERSION="v36.0"
     CH_URL_BASE="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$CH_VERSION"
 
     [ "$CH_ARCH" = "aarch64" ] && CH_NAME="cloud-hypervisor-static-aarch64"
diff --git a/src/integration.rs b/src/integration.rs
index 9bb63c7e..68dabe9e 100644
--- a/src/integration.rs
+++ b/src/integration.rs
@@ -492,9 +492,8 @@ mod tests {
                 "--kernel",
                 &format!("target/{TARGET_TRIPLE}/release/hypervisor-fw"),
                 "--disk",
-                &format!("path={os}"),
-                "--disk",
-                &format!("path={ci}"),
+                format!("path={os}").as_str(),
+                format!("path={ci}").as_str(),
                 "--net",
                 &format!("tap={},mac={}", net.tap_name, net.guest_mac),
             ]);