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

Commit aa8d5944 authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: Move irq routing to generic code 



The IRQ routing set ioctl lives in the hacky device assignment code inside
of KVM today. This is definitely the wrong place for it. Move it to the much
more natural kvm_main.c.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 7eee2efd

virt/kvm/assigned-dev.c

+0 −30
Original line number Diff line number Diff line
@@ -983,36 +983,6 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
			goto out;

		break;

	}

#ifdef KVM_CAP_IRQ_ROUTING

	case KVM_SET_GSI_ROUTING: {

		struct kvm_irq_routing routing;

		struct kvm_irq_routing __user *urouting;

		struct kvm_irq_routing_entry *entries;



		r = -EFAULT;

		if (copy_from_user(&routing, argp, sizeof(routing)))

			goto out;

		r = -EINVAL;

		if (routing.nr >= KVM_MAX_IRQ_ROUTES)

			goto out;

		if (routing.flags)

			goto out;

		r = -ENOMEM;

		entries = vmalloc(routing.nr * sizeof(*entries));

		if (!entries)

			goto out;

		r = -EFAULT;

		urouting = argp;

		if (copy_from_user(entries, urouting->entries,

				   routing.nr * sizeof(*entries)))

			goto out_free_irq_routing;

		r = kvm_set_irq_routing(kvm, entries, routing.nr,

					routing.flags);

	out_free_irq_routing:

		vfree(entries);

		break;

	}

#endif /* KVM_CAP_IRQ_ROUTING */

#ifdef __KVM_HAVE_MSIX

	case KVM_ASSIGN_SET_MSIX_NR: {

		struct kvm_assigned_msix_nr entry_nr;

virt/kvm/kvm_main.c

+30 −0
Original line number Diff line number Diff line
@@ -2274,6 +2274,36 @@ static long kvm_vm_ioctl(struct file *filp, 
		break;

	}

#endif

#ifdef CONFIG_HAVE_KVM_IRQ_ROUTING

	case KVM_SET_GSI_ROUTING: {

		struct kvm_irq_routing routing;

		struct kvm_irq_routing __user *urouting;

		struct kvm_irq_routing_entry *entries;



		r = -EFAULT;

		if (copy_from_user(&routing, argp, sizeof(routing)))

			goto out;

		r = -EINVAL;

		if (routing.nr >= KVM_MAX_IRQ_ROUTES)

			goto out;

		if (routing.flags)

			goto out;

		r = -ENOMEM;

		entries = vmalloc(routing.nr * sizeof(*entries));

		if (!entries)

			goto out;

		r = -EFAULT;

		urouting = argp;

		if (copy_from_user(entries, urouting->entries,

				   routing.nr * sizeof(*entries)))

			goto out_free_irq_routing;

		r = kvm_set_irq_routing(kvm, entries, routing.nr,

					routing.flags);

	out_free_irq_routing:

		vfree(entries);

		break;

	}

#endif /* CONFIG_HAVE_KVM_IRQ_ROUTING */

	default:

		r = kvm_arch_vm_ioctl(filp, ioctl, arg);

		if (r == -ENOTTY)