|
@@ -154,7 +154,7 @@
|
|
|
* KVM AIA only supports APLIC MSI, fallback to QEMU emulation if we want to use
|
|
|
* APLIC Wired.
|
|
|
*/
|
|
|
-static bool is_kvm_aia(bool msimode)
|
|
|
+bool riscv_is_kvm_aia_aplic_imsic(bool msimode)
|
|
|
{
|
|
|
return kvm_irqchip_in_kernel() && msimode;
|
|
|
}
|
|
@@ -857,7 +857,7 @@ static void riscv_aplic_realize(DeviceState *dev, Error **errp)
|
|
|
uint32_t i;
|
|
|
RISCVAPLICState *aplic = RISCV_APLIC(dev);
|
|
|
|
|
|
- if (!is_kvm_aia(aplic->msimode)) {
|
|
|
+ if (!riscv_is_kvm_aia_aplic_imsic(aplic->msimode)) {
|
|
|
aplic->bitfield_words = (aplic->num_irqs + 31) >> 5;
|
|
|
aplic->sourcecfg = g_new0(uint32_t, aplic->num_irqs);
|
|
|
aplic->state = g_new0(uint32_t, aplic->num_irqs);
|
|
@@ -881,7 +881,7 @@ static void riscv_aplic_realize(DeviceState *dev, Error **errp)
|
|
|
* have IRQ lines delegated by their parent APLIC.
|
|
|
*/
|
|
|
if (!aplic->parent) {
|
|
|
- if (kvm_enabled() && is_kvm_aia(aplic->msimode)) {
|
|
|
+ if (kvm_enabled() && riscv_is_kvm_aia_aplic_imsic(aplic->msimode)) {
|
|
|
qdev_init_gpio_in(dev, riscv_kvm_aplic_request, aplic->num_irqs);
|
|
|
} else {
|
|
|
qdev_init_gpio_in(dev, riscv_aplic_request, aplic->num_irqs);
|
|
@@ -1025,7 +1025,7 @@ DeviceState *riscv_aplic_create(hwaddr addr, hwaddr size,
|
|
|
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
|
|
|
|
|
- if (!is_kvm_aia(msimode)) {
|
|
|
+ if (!riscv_is_kvm_aia_aplic_imsic(msimode)) {
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr);
|
|
|
}
|
|
|
|