In the handling of writes to the IRS_SPI_RESAMPLER register,
we call a trace function, passing it information about the SPI
being resampled. However, spi could be NULL if the guest tried
to resample a nonexistent SPI or one configured for a different
domain. Move the trace statement inside the "if (spi)" block,
as it's only interesting trace if we actually did a resample
and potentially changed the state of the SPI.
CID: 1959593
Fixes: 33185e1d64e ("hw/intc/arm_gicv5: Update SPI state for CLEAR/SET events")
Signed-off-by: Peter Maydell <[email protected]>
---
hw/intc/arm_gicv5.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/intc/arm_gicv5.c b/hw/intc/arm_gicv5.c
index 493d664625..7ad274e369 100644
--- a/hw/intc/arm_gicv5.c
+++ b/hw/intc/arm_gicv5.c
@@ -1643,8 +1643,8 @@ static bool config_writel(GICv5 *s, GICv5Domain domain,
hwaddr offset,
if (spi) {
spi_sample(spi);
irs_recalc_hppi(s, spi->domain, spi->iaffid);
+ trace_gicv5_spi_state(id, spi->level, spi->pending, spi->active);
}
- trace_gicv5_spi_state(id, spi->level, spi->pending, spi->active);
return true;
}
case A_IRS_CR0:
--
2.43.0
