commit d9ada132df6ec4744336f0ebdbffad1348ec1e64
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 08 16:11:31 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 08 16:11:31 2023 +0000
tree b38d10eb7fa2156f0676d28cb5f25e5716ef4108
parent 7631271c97a2fed88ad4b19ec4d0f7104d8def35
parent fc3e8b57b97e85550ee3e300479d3adb0528d5f6

Merge "pvmfw: Re-scope global var FILTERED_VM_DTBO_PROP" into main

pvmfw/src/device_assignment.rs

diff --git a/pvmfw/src/device_assignment.rs b/pvmfw/src/device_assignment.rs
index 13ff6c0..7eae09f 100644
--- a/pvmfw/src/device_assignment.rs
+++ b/pvmfw/src/device_assignment.rs
@@ -40,12 +40,6 @@
     }};
 }
 
-const FILTERED_VM_DTBO_PROP: [&CStr; 3] = [
-    cstr!("android,pvmfw,phy-reg"),
-    cstr!("android,pvmfw,phy-iommu"),
-    cstr!("android,pvmfw,phy-sid"),
-];
-
 // TODO(b/277993056): Keep constants derived from platform.dts in one place.
 const CELLS_PER_INTERRUPT: usize = 3; // from /intc node in platform.dts
 
@@ -287,7 +281,12 @@
             node.nop()?;
         }
 
-        // Filters unused properties in assigned device node
+        // Filters pvmfw-specific properties in assigned device node.
+        const FILTERED_VM_DTBO_PROP: [&CStr; 3] = [
+            cstr!("android,pvmfw,phy-reg"),
+            cstr!("android,pvmfw,phy-iommu"),
+            cstr!("android,pvmfw,phy-sid"),
+        ];
         for assigned_device in &self.assigned_devices {
             let mut node = vm_dtbo.node_mut(&assigned_device.dtbo_node_path).unwrap().unwrap();
             for prop in FILTERED_VM_DTBO_PROP {