| commit | f86d5dbb46bb06d27c1ac74212681009e5d74708 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Aug 21 07:11:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 21 07:11:15 2023 +0000 |
| tree | 5bd6756605f57cec684229df42aa0a57e09f73f6 | |
| parent | 7ed90c76c4105ab7e54522e6c8ac3237603ae32f [diff] | |
| parent | 9b56f9a9b91aebd7209ab6d753c21183780545ae [diff] |
Merge "Change hardcoded vm_dtbo_idx" into main am: 9b56f9a9b9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2719013 Change-Id: I7b063fb6e43a021a5806b67074c8f47d8c15daf3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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(())