@samitouri / QOSamiQemu / commits / fdfcd98f66

hw/riscv/virt-acpi-build: Fix RINTC PLIC context ID for KVM

Each RISC-V MADT RINTC entry contains an External Interrupt Controller ID field. On the virt machine without AIA, this field identifies the S-mode PLIC context associated with the hart. TCG virt has both M-mode and S-mode PLIC contexts, so the S-mode context ID is odd and 2 * local_cpu_id + 1 is correct. KVM virt exposes only S-mode PLIC contexts, and those contexts are numbered contiguously from 0. Reporting the TCG context ID for KVM makes the guest enable a different PLIC context from the one used by QEMU. With ACPI enabled, this can leave PCI INTx interrupts pending in QEMU while the guest-programmed PLIC context remains disabled. A virtio-blk root disk can then stall during boot because its first interrupt is never delivered. Use local_cpu_id for KVM and keep the existing odd S-mode context ID for TCG. Fixes: d641da6ed43 ("hw/riscv/virt-acpi-build.c: Add PLIC in MADT") Signed-off-by: Qingwei Hu <qingwei.hu@bytedance.com> Reviewed-by: Nutty Liu <nutty.liu@hotmail.com> Reviewed-by: Sunil V L <sunilvl@oss.qualcomm.com> Message-ID: <20260604120017.398890-1-qingwei.hu@bytedance.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Qingwei Hu committed Jun 4, 2026 at 20:00 UTC fdfcd98f6656b0cf425475bd8ce7f4c08adf8ca6
1 file changed +2
hw/riscv/virt-acpi-build.c
+2
@@ -100,6 +100,8 @@ static void riscv_acpi_madt_add_rintc(uint32_t uid,
100 build_append_int_noprefix(entry,
101 ACPI_BUILD_INTC_ID(
102 arch_ids->cpus[uid].props.node_id,
103 + kvm_enabled() ?
104 + local_cpu_id :
105 2 * local_cpu_id + 1),
106 4);
107 } else {