commit 1ff7b849355aa90921b8296bfd2223829fe081b3
author Frederick Mayle <fmayle@google.com> Fri Jul 12 16:20:09 2024 -0700
committer Frederick Mayle <fmayle@google.com> Fri Jul 12 16:27:48 2024 -0700
tree 9573f8a6321ab4c7a3bb024c2e79f615300401fa
parent 9b6c1443dbc708bbcd826a1ba227b16a0e3aec59

fix crosvm deprecated cmdline arg warnings

Should have the same behavior.

Test: launch microdroid and check logcat
Change-Id: I7105ea119899119a005babc34b9b5100c5e14b89

virtualizationmanager/src/crosvm.rs

diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index a9a91fe..d9e80e2 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -1058,9 +1058,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 {