commit 9b56f9a9b91aebd7209ab6d753c21183780545ae
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Aug 21 06:55:04 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 21 06:55:04 2023 +0000
tree 5bd6756605f57cec684229df42aa0a57e09f73f6
parent 5315e1d35b8a75011564dbb792b1f1095f45ca98
parent adb2166738650f2d0398dd10033556cfb0161768

Merge "Change hardcoded vm_dtbo_idx" into main

virtualizationservice/vfio_handler/src/aidl.rs

diff --git a/virtualizationservice/vfio_handler/src/aidl.rs b/virtualizationservice/vfio_handler/src/aidl.rs
index 818224e..15acfb8 100644
--- a/virtualizationservice/vfio_handler/src/aidl.rs
+++ b/virtualizationservice/vfio_handler/src/aidl.rs
@@ -288,8 +288,8 @@
         .or_service_specific_exception(-1)?;
 
     let dt_table_header = get_dt_table_header(&mut dtbo_img)?;
-    // TODO(b/291190552): Use vm_dtbo_idx from bootconfig.
-    let vm_dtbo_idx = 3;
+    // TODO(b/296799016): Use vm_dtbo_idx from bootconfig.
+    let vm_dtbo_idx = 20;
     let dt_table_entry = get_dt_table_entry(&mut dtbo_img, &dt_table_header, vm_dtbo_idx)?;
     filter_dtbo_from_img(&mut dtbo_img, &dt_table_entry, dtbo_fd)?;
     Ok(())