diff options
| author | Edgar E. Iglesias | 2020-12-14 23:21:54 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-08 16:13:37 +0100 |
| commit | 4663b72a48fd540cbe16053b01d6839a95656440 (patch) | |
| tree | fc5c15341e89f58213ec534ef452c56563c56d41 | |
| parent | Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210107' into... (diff) | |
| download | qemu-4663b72a48fd540cbe16053b01d6839a95656440.tar.gz qemu-4663b72a48fd540cbe16053b01d6839a95656440.tar.xz qemu-4663b72a48fd540cbe16053b01d6839a95656440.zip | |
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>
| -rw-r--r-- | hw/intc/arm_gic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index c60dc6b5e6..af41e2fb44 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -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, int group_mask) { + int cpu_iface = virt ? (cpu + GIC_NCPU) : cpu; + if (!virt && !(s->ctlr & group_mask)) { return false; } @@ -149,7 +151,7 @@ static inline bool gic_irq_signaling_enabled(GICState *s, int cpu, bool virt, return false; } - if (!(s->cpu_ctlr[cpu] & group_mask)) { + if (!(s->cpu_ctlr[cpu_iface] & group_mask)) { return false; } |