commit f36347b06ad5d68febaa65fd6f8025a47329bb14
author Inseob Kim <inseob@google.com> Thu Aug 03 12:52:48 2023 +0900
committer Inseob Kim <inseob@google.com> Mon Aug 07 07:49:08 2023 +0000
tree 3d96a194eb874bab5349bc9d4313b5c7b9bda8eb
parent df1e21722bafe474971e2f9af1482c329bc6d3b9

Use regular file for VM DTBO

Bug: 287379025
Test: adb shell /apex/com.android.virt/bin/vm run-microdroid \
          --protected --mem 512 --devices \
          /sys/bus/platform/devices/16d00000.eh
Change-Id: Iad237c86ff2d1eca89c03d1b399f52877f24fa9a

virtualizationservice/src/aidl.rs

diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 384915c..2e667d4 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -183,12 +183,18 @@
         }])
     }
 
-    fn bindDevicesToVfioDriver(&self, devices: &[String]) -> binder::Result<ParcelFileDescriptor> {
+    fn bindDevicesToVfioDriver(
+        &self,
+        devices: &[String],
+        dtbo: &ParcelFileDescriptor,
+    ) -> binder::Result<()> {
         check_use_custom_virtual_machine()?;
 
         let vfio_service: Strong<dyn IVfioHandler> =
             wait_for_interface(<BpVfioHandler as IVfioHandler>::get_descriptor())?;
-        vfio_service.bindDevicesToVfioDriver(devices)
+
+        vfio_service.bindDevicesToVfioDriver(devices, dtbo)?;
+        Ok(())
     }
 }