| Message ID | 34464c9cb7c603a22bb6849b78575ee286368936.1438770954.git.p.fedin@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 483b5d1..199a50a 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -449,7 +449,7 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) * Map the VGIC hardware resources before running a vcpu the first * time on this VM. */ - if (unlikely(!vgic_ready(kvm))) { + if (unlikely(irqchip_in_kernel(kvm) && !vgic_ready(kvm))) { ret = kvm_vgic_map_resources(kvm); if (ret) return ret;
Makes qemu working again with kernel-irqchip=off option, allowing to use GIC emulation in userspace. Previously kvm_vgic_map_resources() used to include irqchip_in_kernel() check, and vgic_v2_map_resources() still has it, but now vm_ops are not initialized before kvm_vgic_create(). Therefore kvm_vgic_map_resources() call without vGIC instantiation attempts to call vm_ops.map_resources == NULL The bug was introduced in b26e5fdac43c1b7c394502917e42e3b91f3aa1a3 Signed-off-by: Pavel Fedin <p.fedin@samsung.com> --- arch/arm/kvm/arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)