From: Maria Celeste Cesario
The xen sources contain violations of MISRA C:2012 Rule 14.4 whose
headline states:
"The controlling expression of an if statement and the controlling
expression of an iteration-statement shall have essentially Boolean type".
Add comparisons to avoid using enum constants as controlling expressions
to comply with Rule 14.4.
No functional change.
Signed-off-by: Maria Celeste Cesario
Signed-off-by: Simone Ballarin
---
xen/drivers/passthrough/amd/iommu_init.c | 4 ++--
xen/drivers/passthrough/vtd/iommu.c | 4 ++--
xen/drivers/passthrough/vtd/quirks.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xen/drivers/passthrough/amd/iommu_init.c
b/xen/drivers/passthrough/amd/iommu_init.c
index 5515cb70fd..e02a09a9a7 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -1480,7 +1480,7 @@ int __init amd_iommu_init(bool xt)
goto error_out;
}
-if ( iommu_intremap )
+if ( iommu_intremap != iommu_intremap_off )
register_keyhandler('V', &amd_iommu_dump_intremap_tables,
"dump IOMMU intremap tables", 0);
@@ -1498,7 +1498,7 @@ int __init amd_iommu_init_late(void)
/* Further initialize the device table(s). */
pci_init = true;
-if ( iommu_intremap )
+if ( iommu_intremap != iommu_intremap_off )
rc = iterate_ivrs_mappings(amd_iommu_setup_device_table);
for_each_amd_iommu ( iommu )
diff --git a/xen/drivers/passthrough/vtd/iommu.c
b/xen/drivers/passthrough/vtd/iommu.c
index e13b7d99db..bd6d69a6f5 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -2543,7 +2543,7 @@ static int __must_check init_vtd_hw(bool resume)
/*
* Enable interrupt remapping
*/
-if ( iommu_intremap )
+if ( iommu_intremap != iommu_intremap_off )
{
int apic;
for ( apic = 0; apic < nr_ioapics; apic++ )
@@ -2559,7 +2559,7 @@ static int __must_check init_vtd_hw(bool resume)
}
}
}
-if ( iommu_intremap )
+if ( iommu_intremap != iommu_intremap_off )
{
for_each_drhd_unit ( drhd )
{
diff --git a/xen/drivers/passthrough/vtd/quirks.c
b/xen/drivers/passthrough/vtd/quirks.c
index 5a56565ea8..950dcd56ef 100644
--- a/xen/drivers/passthrough/vtd/quirks.c
+++ b/xen/drivers/passthrough/vtd/quirks.c
@@ -392,7 +392,7 @@ void __init platform_quirks_init(void)
map_igd_reg();
/* Tylersburg interrupt remap quirk */
-if ( iommu_intremap )
+if ( iommu_intremap != iommu_intremap_off )
tylersburg_intremap_quirk();
}
--
2.40.0