commit f8d941138dc0da9a1bf4a1de0e3ef9b626cd8898
author Andrew Walbran <qwandor@google.com> Tue Sep 07 11:45:36 2021 +0000
committer Andrew Walbran <qwandor@google.com> Thu Sep 09 10:18:08 2021 +0000
tree 593a0c60b81095c070dcf4fdd4dee2960297dacb
parent cb461548fbf38978b685429109970ba250783933

Separate creation and starting of VMs.

Bug: 199127239
Test: atest VirtualizationTestCases
Change-Id: I2cb436c2acd6b4830aab0a044ed03fb688459fe0

compos/common/compos_client.rs

diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index dd8e54f..22304f1 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -82,7 +82,7 @@
         )
         .context("Failed to find VirtualizationService")?;
 
-        let vm = service.startVm(&config, Some(&log_fd)).context("Failed to start VM")?;
+        let vm = service.createVm(&config, Some(&log_fd)).context("Failed to create VM")?;
         let vm_state = Arc::new(VmStateMonitor::default());
 
         let vm_state_clone = Arc::clone(&vm_state);
@@ -98,6 +98,8 @@
         );
         vm.registerCallback(&callback)?;
 
+        vm.start()?;
+
         let cid = vm_state.wait_for_start()?;
 
         // TODO: Use onPayloadReady to avoid this