From b3b51bd3a2d45c871ec1534f7d5a4a50197543bd Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 12 Nov 2025 18:31:08 +0000 Subject: [PATCH] tests: aarch64: Fix test_virtio_iommu for kernel IOMMU groups change The numbers for the IOMMU groups have shifted after the update to Linux kernel 6.16.9. Signed-off-by: Rob Bradford --- tests/integration.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index 53a464e8e..87ffc08a9 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -2283,7 +2283,7 @@ fn _test_virtio_iommu(acpi: bool) { // contains "0000:00:02.0" which is the first disk. // // Verify the iommu group of the first disk. - let iommu_group = !acpi as i32; + let iommu_group = if acpi { 0 } else { 2 }; assert_eq!( guest .ssh_command(format!("ls /sys/kernel/iommu_groups/{iommu_group}/devices").as_str()) @@ -2293,7 +2293,7 @@ fn _test_virtio_iommu(acpi: bool) { ); // Verify the iommu group of the second disk. - let iommu_group = if acpi { 1 } else { 2 }; + let iommu_group = if acpi { 1 } else { 3 }; assert_eq!( guest .ssh_command(format!("ls /sys/kernel/iommu_groups/{iommu_group}/devices").as_str()) @@ -2303,7 +2303,7 @@ fn _test_virtio_iommu(acpi: bool) { ); // Verify the iommu group of the network card. - let iommu_group = if acpi { 2 } else { 3 }; + let iommu_group = if acpi { 2 } else { 4 }; assert_eq!( guest .ssh_command(format!("ls /sys/kernel/iommu_groups/{iommu_group}/devices").as_str())