Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23d43cf9 authored by Christoffer Dall's avatar Christoffer Dall Committed by Avi Kivity
Browse files

KVM: Move KVM_IRQ_LINE to arch-generic code 



Handle KVM_IRQ_LINE and KVM_IRQ_LINE_STATUS in the generic
kvm_vm_ioctl() function and call into kvm_vm_ioctl_irq_line().

This is even more relevant when KVM/ARM also uses this ioctl.

Signed-off-by: default avatarChristoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 99245b50

arch/ia64/kvm/kvm-ia64.c

+10 −23
Original line number Diff line number Diff line
@@ -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->status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,

					irq_event->irq, irq_event->level);

	return 0;

}



long kvm_arch_vm_ioctl(struct file *filp,

		unsigned int ioctl, unsigned long arg)

{
@@ -963,29 +973,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
			goto out;

		}

		break;

	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 = -ENXIO;

		if (irqchip_in_kernel(kvm)) {

			__s32 status;

			status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,

				    irq_event.irq, irq_event.level);

			if (ioctl == KVM_IRQ_LINE_STATUS) {

				r = -EFAULT;

				irq_event.status = status;

				if (copy_to_user(argp, &irq_event,

							sizeof irq_event))

					goto out;

			}

			r = 0;

		}

		break;

		}

	case KVM_GET_IRQCHIP: {

		/* 0: PIC master, 1: PIC slave, 2: IOAPIC */

		struct kvm_irqchip chip;

arch/x86/kvm/x86.c

+10 −23
Original line number Diff line number Diff line
@@ -3165,6 +3165,16 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) 
	return r;

}



int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event)

{

	if (!irqchip_in_kernel(kvm))

		return -ENXIO;



	irq_event->status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,

					irq_event->irq, irq_event->level);

	return 0;

}



long kvm_arch_vm_ioctl(struct file *filp,

		       unsigned int ioctl, unsigned long arg)

{
@@ -3271,29 +3281,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 
	create_pit_unlock:

		mutex_unlock(&kvm->slots_lock);

		break;

	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 = -ENXIO;

		if (irqchip_in_kernel(kvm)) {

			__s32 status;

			status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,

					irq_event.irq, irq_event.level);

			if (ioctl == KVM_IRQ_LINE_STATUS) {

				r = -EFAULT;

				irq_event.status = status;

				if (copy_to_user(argp, &irq_event,

							sizeof irq_event))

					goto out;

			}

			r = 0;

		}

		break;

	}

	case KVM_GET_IRQCHIP: {

		/* 0: PIC master, 1: PIC slave, 2: IOAPIC */

		struct kvm_irqchip *chip;

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, 
				   struct

				   kvm_userspace_memory_region *mem,

				   int user_alloc);

int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level);

long kvm_arch_vm_ioctl(struct file *filp,

		       unsigned int ioctl, unsigned long arg);

virt/kvm/kvm_main.c

+23 −0
Original line number Diff line number Diff line
@@ -2148,6 +2148,29 @@ static long kvm_vm_ioctl(struct file *filp, 
		r = kvm_send_userspace_msi(kvm, &msi);

		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);

		if (r)

			goto out;



		r = -EFAULT;

		if (ioctl == KVM_IRQ_LINE_STATUS) {

			if (copy_to_user(argp, &irq_event, sizeof irq_event))

				goto out;

		}



		r = 0;

		break;

	}

#endif

	default:

		r = kvm_arch_vm_ioctl(filp, ioctl, arg);