From: Marc Zyngier <maz@kernel.org> Although it is safe for now, do condition the returning of a msis_require_devid capability on the irqchip being a GICv3. Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: wanghaibin <wanghaibin.wang@huawei.com> --- arch/arm64/kvm/arm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 2e67b6353c06..5b207573fbfb 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -478,7 +478,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) if (!kvm) r = -EINVAL; else - r = kvm->arch.vgic.msis_require_devid; + r = (irqchip_is_gic_v3(kvm) && + kvm->arch.vgic.msis_require_devid); break; case KVM_CAP_ARM_USER_IRQ: /* -- 2.33.0