starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

hw/intc: riscv_aplic: Skip reset for KVM irqchip

Browse Source 
The emulated APLIC state arrays are only allocated when QEMU handles
the interrupt controller state itself. With KVM AIA/APLIC-IMSIC, the
interrupt controller state is owned by the KVM in-kernel irqchip, so
these emulated state arrays are not allocated.

The APLIC reset handler still clears those arrays unconditionally. This
makes qemu_system_reset(), which runs during machine creation,
dereference NULL pointers with -machine virt,aia=aplic-imsic and KVM.

Skip the emulated APLIC reset path when the interrupt controller is
handled by KVM. The emulated path is unchanged for TCG and for
configurations that use QEMU emulation.

Fixes: 99bfcd329a ("hw/intc: riscv_aplic: Add reset API to APLIC")
Reviewed-by: Nutty Liu <nutty.liu@hotmail.com>
Signed-off-by: Qingwei Hu <qingwei.hu@bytedance.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20260615131925.3019370-2-qingwei.hu@bytedance.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Qingwei Hu
2026-06-15 21:19:24 +08:00
committed by Alistair Francis
parent 46d96da130
commit bedb5cb25e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/riscv_aplic.c
View File

@@ -910,6 +910,10 @@ static void riscv_aplic_reset_enter(Object *obj, ResetType type)
RISCVAPLICState *aplic = RISCV_APLIC(obj);
int i;
if (!riscv_use_emulated_aplic(aplic->msimode)) {
return;
}
aplic->domaincfg = 0;
memset(aplic->sourcecfg, 0, sizeof(uint32_t) * aplic->num_irqs);
memset(aplic->target, 0, sizeof(uint32_t) * aplic->num_irqs);