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

Commit 76954056 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: device assignment: remove pointless #ifdefs 



The symbols are always defined.

Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b97e6de9

arch/x86/kvm/assigned-dev.c

+0 −25
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ static irqreturn_t kvm_assigned_dev_thread_intx(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



#ifdef __KVM_HAVE_MSI

static irqreturn_t kvm_assigned_dev_msi(int irq, void *dev_id)

{

	struct kvm_assigned_dev_kernel *assigned_dev = dev_id;
@@ -150,9 +149,7 @@ static irqreturn_t kvm_assigned_dev_thread_msi(int irq, void *dev_id) 


	return IRQ_HANDLED;

}

#endif



#ifdef __KVM_HAVE_MSIX

static irqreturn_t kvm_assigned_dev_msix(int irq, void *dev_id)

{

	struct kvm_assigned_dev_kernel *assigned_dev = dev_id;
@@ -183,7 +180,6 @@ static irqreturn_t kvm_assigned_dev_thread_msix(int irq, void *dev_id) 


	return IRQ_HANDLED;

}

#endif



/* Ack the irq line for an assigned device */

static void kvm_assigned_dev_ack_irq(struct kvm_irq_ack_notifier *kian)
@@ -386,7 +382,6 @@ static int assigned_device_enable_host_intx(struct kvm *kvm, 
	return 0;

}



#ifdef __KVM_HAVE_MSI

static int assigned_device_enable_host_msi(struct kvm *kvm,

					   struct kvm_assigned_dev_kernel *dev)

{
@@ -408,9 +403,7 @@ static int assigned_device_enable_host_msi(struct kvm *kvm, 


	return 0;

}

#endif



#ifdef __KVM_HAVE_MSIX

static int assigned_device_enable_host_msix(struct kvm *kvm,

					    struct kvm_assigned_dev_kernel *dev)

{
@@ -443,8 +436,6 @@ static int assigned_device_enable_host_msix(struct kvm *kvm, 
	return r;

}



#endif



static int assigned_device_enable_guest_intx(struct kvm *kvm,

				struct kvm_assigned_dev_kernel *dev,

				struct kvm_assigned_irq *irq)
@@ -454,7 +445,6 @@ static int assigned_device_enable_guest_intx(struct kvm *kvm, 
	return 0;

}



#ifdef __KVM_HAVE_MSI

static int assigned_device_enable_guest_msi(struct kvm *kvm,

			struct kvm_assigned_dev_kernel *dev,

			struct kvm_assigned_irq *irq)
@@ -463,9 +453,7 @@ static int assigned_device_enable_guest_msi(struct kvm *kvm, 
	dev->ack_notifier.gsi = -1;

	return 0;

}

#endif



#ifdef __KVM_HAVE_MSIX

static int assigned_device_enable_guest_msix(struct kvm *kvm,

			struct kvm_assigned_dev_kernel *dev,

			struct kvm_assigned_irq *irq)
@@ -474,7 +462,6 @@ static int assigned_device_enable_guest_msix(struct kvm *kvm, 
	dev->ack_notifier.gsi = -1;

	return 0;

}

#endif



static int assign_host_irq(struct kvm *kvm,

			   struct kvm_assigned_dev_kernel *dev,
@@ -492,16 +479,12 @@ static int assign_host_irq(struct kvm *kvm, 
	case KVM_DEV_IRQ_HOST_INTX:

		r = assigned_device_enable_host_intx(kvm, dev);

		break;

#ifdef __KVM_HAVE_MSI

	case KVM_DEV_IRQ_HOST_MSI:

		r = assigned_device_enable_host_msi(kvm, dev);

		break;

#endif

#ifdef __KVM_HAVE_MSIX

	case KVM_DEV_IRQ_HOST_MSIX:

		r = assigned_device_enable_host_msix(kvm, dev);

		break;

#endif

	default:

		r = -EINVAL;

	}
@@ -534,16 +517,12 @@ static int assign_guest_irq(struct kvm *kvm, 
	case KVM_DEV_IRQ_GUEST_INTX:

		r = assigned_device_enable_guest_intx(kvm, dev, irq);

		break;

#ifdef __KVM_HAVE_MSI

	case KVM_DEV_IRQ_GUEST_MSI:

		r = assigned_device_enable_guest_msi(kvm, dev, irq);

		break;

#endif

#ifdef __KVM_HAVE_MSIX

	case KVM_DEV_IRQ_GUEST_MSIX:

		r = assigned_device_enable_guest_msix(kvm, dev, irq);

		break;

#endif

	default:

		r = -EINVAL;

	}
@@ -826,7 +805,6 @@ static int kvm_vm_ioctl_deassign_device(struct kvm *kvm, 
}





#ifdef __KVM_HAVE_MSIX

static int kvm_vm_ioctl_set_msix_nr(struct kvm *kvm,

				    struct kvm_assigned_msix_nr *entry_nr)

{
@@ -906,7 +884,6 @@ static int kvm_vm_ioctl_set_msix_entry(struct kvm *kvm, 


	return r;

}

#endif



static int kvm_vm_ioctl_set_pci_irq_mask(struct kvm *kvm,

		struct kvm_assigned_pci_dev *assigned_dev)
@@ -1012,7 +989,6 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
			goto out;

		break;

	}

#ifdef __KVM_HAVE_MSIX

	case KVM_ASSIGN_SET_MSIX_NR: {

		struct kvm_assigned_msix_nr entry_nr;

		r = -EFAULT;
@@ -1033,7 +1009,6 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, 
			goto out;

		break;

	}

#endif

	case KVM_ASSIGN_SET_INTX_MASK: {

		struct kvm_assigned_pci_dev assigned_dev;