ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

intc/arm_gic: Fix gic_irq_signaling_enabled() for vCPUs 

Correct the indexing into s->cpu_ctlr for vCPUs.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Message-id: 20201214222154.3480243-2-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2020-12-14 23:21:54 +01:00 committed by Peter Maydell
parent e79de63ab1
commit 4663b72a48
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/arm_gic.c
View File

@ -141,6 +141,8 @@ static inline void gic_get_best_virq(GICState *s, int cpu,
static inline bool gic_irq_signaling_enabled(GICState *s, int cpu, bool virt, static inline bool gic_irq_signaling_enabled(GICState *s, int cpu, bool virt,
int group_mask) int group_mask)
{ {
int cpu_iface = virt ? (cpu + GIC_NCPU) : cpu;
if (!virt && !(s->ctlr & group_mask)) { if (!virt && !(s->ctlr & group_mask)) {
return false; return false;
} }
@ -149,7 +151,7 @@ static inline bool gic_irq_signaling_enabled(GICState *s, int cpu, bool virt,
return false; return false;
} }
if (!(s->cpu_ctlr[cpu] & group_mask)) { if (!(s->cpu_ctlr[cpu_iface] & group_mask)) {
return false; return false;
} }