aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-01-07 17:07:58 +0000
committerPeter Maydell <peter.maydell@linaro.org>2022-01-07 17:07:58 +0000
commit62df780e3d4e918d984797f2d75b0cced157b757 (patch)
treee91232db69baace296df54d9ca09076544cf3f03 /hw
parent6c1db43de4965b5274830bbd36298638a6dbb468 (diff)
downloadqemu-62df780e3d4e918d984797f2d75b0cced157b757.zip
qemu-62df780e3d4e918d984797f2d75b0cced157b757.tar.gz
qemu-62df780e3d4e918d984797f2d75b0cced157b757.tar.bz2
hw/intc/arm_gicv3_its: Don't return early in extract_table_params() loop
In extract_table_params() we process each GITS_BASER<n> register. If the register's Valid bit is not set, this means there is no in-guest-memory table and so we should not try to interpret the other fields in the register. This was incorrectly coded as a 'return' rather than a 'break', so instead of looping round to process the next GITS_BASER<n> we would stop entirely, treating any later tables as being not valid also. This has no real guest-visible effects because (since we don't have GITS_TYPER.HCC != 0) the guest must in any case set up all the GITS_BASER<n> to point to valid tables, so this only happens in an odd misbehaving-guest corner case. Fix the check to 'break', so that we leave the case statement and loop back around to the next GITS_BASER<n>. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r--hw/intc/arm_gicv3_its.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c
index f321f10..c97b998 100644
--- a/hw/intc/arm_gicv3_its.c
+++ b/hw/intc/arm_gicv3_its.c
@@ -795,7 +795,7 @@ static void extract_table_params(GICv3ITSState *s)
s->dt.valid = FIELD_EX64(value, GITS_BASER, VALID);
if (!s->dt.valid) {
- return;
+ break;
}
s->dt.page_sz = page_sz;
@@ -826,7 +826,7 @@ static void extract_table_params(GICv3ITSState *s)
* hence writes are discarded if ct.valid is 0
*/
if (!s->ct.valid) {
- return;
+ break;
}
s->ct.page_sz = page_sz;