commit 4cfb2b601731807afcb9adbf521489489291fda3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jul 13 00:43:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 13 00:43:22 2024 +0000
tree 55024416c2d8993115441a9ce9ee0e61adb08e06
parent d9d063acae4fb98d7a88e12baf8b1ea80b797eb2
parent 1ff7b849355aa90921b8296bfd2223829fe081b3

Merge "fix crosvm deprecated cmdline arg warnings" into main

virtualizationmanager/src/crosvm.rs

diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index 1998ef7..379a498 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -1059,9 +1059,11 @@
     }
 
     for disk in &config.disks {
-        command
-            .arg(if disk.writable { "--rwdisk" } else { "--disk" })
-            .arg(add_preserved_fd(&mut preserved_fds, &disk.image));
+        command.arg("--block").arg(format!(
+            "path={},ro={}",
+            add_preserved_fd(&mut preserved_fds, &disk.image),
+            !disk.writable,
+        ));
     }
 
     if let Some(kernel) = &config.kernel {