[PATCH v4 03/13] ARM: KVM: Initial VGIC infrastructure support

[Christoffer Dall]

[...]

>> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
>> index 2fb7319..665af96 100644
>> --- a/virt/kvm/kvm_main.c
>> +++ b/virt/kvm/kvm_main.c
>> @@ -1880,12 +1880,13 @@ static long kvm_vcpu_ioctl(struct file *filp,
>>       if (vcpu->kvm->mm != current->mm)
>>               return -EIO;
>>
>> -#if defined(CONFIG_S390) || defined(CONFIG_PPC)
>> +#if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_ARM)
>>       /*
>>        * Special cases: vcpu ioctls that are asynchronous to vcpu execution,
>>        * so vcpu_load() would break it.
>>        */
>> -     if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_INTERRUPT)
>> +     if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_INTERRUPT ||
>> +         ioctl == KVM_IRQ_LINE)
>>               return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
>>  #endif
>
> Separate patch?
>
KVM_IRQ_LINE is a VM ioctl, not a vcpu ioctl, so this is leftover from
the duplicate VCPU/VM same ioctl mess.

It's gone!

-Christoffer