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

Commit 51de271d authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: Clean up kvm_vm_ioctl_assigned_device 



Any arch not supporting device assigment will also not build
assigned-dev.c. So testing for KVM_CAP_DEVICE_DEASSIGNMENT is pointless.
KVM_CAP_ASSIGN_DEV_IRQ is unconditinally set. Moreover, add a default
case for dispatching the ioctl.

Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent ed78661f

virt/kvm/assigned-dev.c

+4 −5
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
				  unsigned long arg)

{

	void __user *argp = (void __user *)arg;

	int r = -ENOTTY;

	int r;



	switch (ioctl) {

	case KVM_ASSIGN_PCI_DEVICE: {
@@ -692,7 +692,6 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
		r = -EOPNOTSUPP;

		break;

	}

#ifdef KVM_CAP_ASSIGN_DEV_IRQ

	case KVM_ASSIGN_DEV_IRQ: {

		struct kvm_assigned_irq assigned_irq;
@@ -715,8 +714,6 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
			goto out;

		break;

	}

#endif

#ifdef KVM_CAP_DEVICE_DEASSIGNMENT

	case KVM_DEASSIGN_PCI_DEVICE: {

		struct kvm_assigned_pci_dev assigned_dev;
@@ -728,7 +725,6 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
			goto out;

		break;

	}

#endif

#ifdef KVM_CAP_IRQ_ROUTING

	case KVM_SET_GSI_ROUTING: {

		struct kvm_irq_routing routing;
@@ -781,6 +777,9 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
		break;

	}

#endif

	default:

		r = -ENOTTY;

		break;

	}

out:

	return r;