commit 94a8a18be61f459120e48d6c3d4e058a22cf0592
author Nikita Ioffe <ioffe@google.com> Thu Nov 16 16:37:48 2023 +0000
committer Nikita Ioffe <ioffe@google.com> Thu Nov 16 16:37:48 2023 +0000
tree c0c3b3a3c08f3481671a82be031f6a50556872c3
parent ae152412f18af5ba194ab9612fd5b9e625637da5

Flag guard vfio_handler

Guard the following on the value of the
RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT flag:

* vfio_handler binary & vfio_handler.rc in com.android.virt APEX;
* --devices flag in the vm shell binary
* Usage of the CustomConfig.devices field in the
  VirtualMachineAppConfig;

Test: atest MicrodroidTests
Change-Id: I40611b0cd93d17aacd68acf74f442e479a80d488

vm/src/run.rs

diff --git a/vm/src/run.rs b/vm/src/run.rs
index 1ba9dec..84c3af6 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -130,7 +130,7 @@
         vendorImage: vendor,
         devices: config
             .microdroid
-            .devices
+            .devices()
             .iter()
             .map(|x| {
                 x.to_str().map(String::from).ok_or(anyhow!("Failed to convert {x:?} to String"))