On Tue, Jul 3, 2012 at 9:50 PM, Marcelo Tosatti <mtosatti@xxxxxxxxxx> wrote:
> On Tue, Jul 03, 2012 at 04:59:54AM -0400, Christoffer Dall wrote:
>> Handle KVM_IRQ_LINE and KVM_IRQ_LINE_STATUS in the generic
>> kvm_vm_ioctl() function and call into kvm_vm_ioctl_irq_line().
>>
>> Signed-off-by: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx>
>> ---
>> arch/ia64/kvm/kvm-ia64.c | 33 ++++++++++-----------------------
>> arch/x86/kvm/x86.c | 33 ++++++++++-----------------------
>> include/linux/kvm_host.h | 1 +
>> virt/kvm/kvm_main.c | 19 +++++++++++++++++++
>> 4 files changed, 40 insertions(+), 46 deletions(-)
>>
>> diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
>> index bd77cb5..122a4b2 100644
>> --- a/arch/ia64/kvm/kvm-ia64.c
>> +++ b/arch/ia64/kvm/kvm-ia64.c
>> @@ -924,6 +924,16 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
>> return 0;
>> }
>>
>> +int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event)
>> +{
>> + if (!irqchip_in_kernel(kvm))
>> + return -ENXIO;
>> +
>> + irq_event->statusstatus = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
>> + irq_event->irq, irq_event->level);
>> + return 0;
>> +}
>
> typo.
>
>> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
>> index 636bd08..1d33877 100644
>> --- a/virt/kvm/kvm_main.c
>> +++ b/virt/kvm/kvm_main.c
>> @@ -2093,6 +2093,25 @@ static long kvm_vm_ioctl(struct file *filp,
>> break;
>> }
>> #endif
>> +#ifdef __KVM_HAVE_IRQ_LINE
>> + case KVM_IRQ_LINE_STATUS:
>> + case KVM_IRQ_LINE: {
>> + struct kvm_irq_level irq_event;
>> +
>> + r = -EFAULT;
>> + if (copy_from_user(&irq_event, argp, sizeof irq_event))
>> + goto out;
>> +
>> + r = kvm_vm_ioctl_irq_line(kvm, &irq_event);
>
> Add
>
> if (r)
> goto out;
> r = -EFAULT;
>
>> + if (ioctl == KVM_IRQ_LINE_STATUS) {
>> + if (copy_to_user(argp, &irq_event, sizeof irq_event))
>> + r = -EFAULT;
>
> Replace "r = -EFAULT" with "goto out"
>
>> + }
>
> Add r = 0;
>
>> +
>> + break;
>> + }
>> +#endif
>> default:
>> r = kvm_arch_vm_ioctl(filp, ioctl, arg);
>> if (r == -ENOTTY)
>>
Thanks!
(sorry about the delay, will repost shortly)
-Christoffer
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
