commit 3da8a161e1e5060b763f76686e63ccb622e76d31
author Chaitanya Cheemala (xWF) <ccheemala@google.com> Tue Jan 21 08:57:09 2025 -0800
committer Chaitanya Cheemala (xWF) <ccheemala@google.com> Tue Jan 21 08:57:09 2025 -0800
tree 02d10cab77c5fbad2702f9373f674b950c7a9648
parent 5159c626e4c8e7e51f8f962abddad0785692ba69

Revert "libvmclient: Take VmCallback in VmInstance::start()"

Revert submission 3408863

Reason for revert: Likely culprit for b/391356639  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3408863

Change-Id: Id9436b9557e0fd4cbc94df9f22ba35132619aa91

tests/backcompat_test/src/main.rs

diff --git a/tests/backcompat_test/src/main.rs b/tests/backcompat_test/src/main.rs
index a7fb074..4113881 100644
--- a/tests/backcompat_test/src/main.rs
+++ b/tests/backcompat_test/src/main.rs
@@ -117,9 +117,10 @@
         /* consoleIn */ None,
         None,
         Some(dump_dt),
+        None,
     )
     .context("Failed to create VM")?;
-    vm.start(None).context("Failed to start VM")?;
+    vm.start().context("Failed to start VM")?;
     info!("Started example VM.");
 
     // Wait for VM to finish

tests/early_vm_test/src/main.rs

diff --git a/tests/early_vm_test/src/main.rs b/tests/early_vm_test/src/main.rs
index 7d630f8..a3c80ca 100644
--- a/tests/early_vm_test/src/main.rs
+++ b/tests/early_vm_test/src/main.rs
@@ -96,6 +96,7 @@
         None, // console_out
         None, // log
         None, // dump_dt
+        None, // callback
     )
     .context("Failed to create VM")?;
 

tests/vm_accessor/accessor/src/run.rs

diff --git a/tests/vm_accessor/accessor/src/run.rs b/tests/vm_accessor/accessor/src/run.rs
index 5bdb8f1..6dcc507 100644
--- a/tests/vm_accessor/accessor/src/run.rs
+++ b/tests/vm_accessor/accessor/src/run.rs
@@ -129,9 +129,10 @@
         None,                    /* console_in */
         Some(android_log_fd()?), /* log */
         None,                    /* dump_dt */
+        Some(Box::new(Callback {})),
     )
     .context("Failed to create VM")?;
-    vm.start(Some(Box::new(Callback {}))).context("Failed to start VM")?;
+    vm.start().context("Failed to start VM")?;
 
     info!("started IAccessor VM with CID {}", vm.cid());
 

tests/vmbase_example/src/main.rs

diff --git a/tests/vmbase_example/src/main.rs b/tests/vmbase_example/src/main.rs
index d427164..cbe90d8 100644
--- a/tests/vmbase_example/src/main.rs
+++ b/tests/vmbase_example/src/main.rs
@@ -115,9 +115,10 @@
         /* consoleIn */ None,
         Some(log_writer),
         /* dump_dt */ None,
+        None,
     )
     .context("Failed to create VM")?;
-    vm.start(None).context("Failed to start VM")?;
+    vm.start().context("Failed to start VM")?;
     info!("Started example VM.");
 
     // Wait for VM to finish, and check that it shut down cleanly.