pvmfw: fix device_info_assigned_info_without_iommus test
The test's DT contains no iommu node, so the field is expected to be
`None` as of https://r.android.com/3464029.
Bug: 380074580
Bug: 385802423
Test: atest libpvmfw.device_assignment.test:tests
Change-Id: Ifb29eb0ae460bbb073995f277da65498e172ceb5
diff --git a/guest/pvmfw/src/device_assignment.rs b/guest/pvmfw/src/device_assignment.rs
index 2e4bb6d..ba13fa3 100644
--- a/guest/pvmfw/src/device_assignment.rs
+++ b/guest/pvmfw/src/device_assignment.rs
@@ -1349,7 +1349,7 @@
node_path: CString::new("/bus0/backlight").unwrap(),
reg: vec![[0x9, 0xFF].into()],
interrupts: Some(into_fdt_prop(vec![0x0, 0xF, 0x4])),
- iommus: Some(vec![]),
+ iommus: None,
}];
assert_eq!(device_info.assigned_devices, expected);
@@ -1455,7 +1455,6 @@
(Ok(c"android,backlight,ignore-gctrl-reset"), Ok(Vec::new())),
(Ok(c"compatible"), Ok(Vec::from(*b"android,backlight\0"))),
(Ok(c"interrupts"), Ok(into_fdt_prop(vec![0x0, 0xF, 0x4]))),
- (Ok(c"iommus"), Ok(Vec::new())),
(Ok(c"phandle"), Ok(into_fdt_prop(vec![phandle.unwrap()]))),
(Ok(c"reg"), Ok(into_fdt_prop(vec![0x0, 0x9, 0x0, 0xFF]))),
];
diff --git a/guest/pvmfw/testdata/expected_dt_with_dependency.dts b/guest/pvmfw/testdata/expected_dt_with_dependency.dts
index 7e0ad20..2823e1a 100644
--- a/guest/pvmfw/testdata/expected_dt_with_dependency.dts
+++ b/guest/pvmfw/testdata/expected_dt_with_dependency.dts
@@ -11,7 +11,6 @@
dep = <&node_a_dep &common>;
reg = <0x0 0xFF000 0x0 0x1>;
interrupts = <0x0 0xF 0x4>;
- iommus;
};
node_a_dep: node_a_dep {
diff --git a/guest/pvmfw/testdata/expected_dt_with_dependency_loop.dts b/guest/pvmfw/testdata/expected_dt_with_dependency_loop.dts
index 61031ab..b1ce262 100644
--- a/guest/pvmfw/testdata/expected_dt_with_dependency_loop.dts
+++ b/guest/pvmfw/testdata/expected_dt_with_dependency_loop.dts
@@ -8,7 +8,6 @@
loop_dep = <&node_c_loop>;
reg = <0x0 0xFF200 0x0 0x1>;
interrupts = <0x0 0xF 0x4>;
- iommus;
};
node_c_loop: node_c_loop {
diff --git a/guest/pvmfw/testdata/expected_dt_with_multiple_dependencies.dts b/guest/pvmfw/testdata/expected_dt_with_multiple_dependencies.dts
index dc8c357..d31c8cd 100644
--- a/guest/pvmfw/testdata/expected_dt_with_multiple_dependencies.dts
+++ b/guest/pvmfw/testdata/expected_dt_with_multiple_dependencies.dts
@@ -13,7 +13,6 @@
dep = <&node_a_dep &common>;
reg = <0x0 0xFF000 0x0 0x1>;
interrupts = <0x0 0xF 0x4>;
- iommus;
};
node_a_dep: node_a_dep {
@@ -38,7 +37,6 @@
dep = <&node_b_dep1 &node_b_dep2>;
reg = <0x00 0xFF100 0x00 0x01>;
interrupts = <0x00 0x0F 0x04>;
- iommus;
};
node_b_dep1: node_b_dep1 {