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

Commit d4db2935 authored by Alex Williamson's avatar Alex Williamson Committed by Marcelo Tosatti
Browse files

KVM: Pass kvm_irqfd to functions 



Prune this down to just the struct kvm_irqfd so we can avoid
changing function definition for every flag or field we use.

Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent ca24a145

include/linux/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ static inline void kvm_free_irq_routing(struct kvm *kvm) {} 
#ifdef CONFIG_HAVE_KVM_EVENTFD



void kvm_eventfd_init(struct kvm *kvm);

int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags);

int kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args);

void kvm_irqfd_release(struct kvm *kvm);

void kvm_irq_routing_update(struct kvm *, struct kvm_irq_routing_table *);

int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args);
@@ -824,7 +824,7 @@ int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args); 


static inline void kvm_eventfd_init(struct kvm *kvm) {}



static inline int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)

static inline int kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)

{

	return -EINVAL;

}

virt/kvm/eventfd.c

+10 −10
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static void irqfd_update(struct kvm *kvm, struct _irqfd *irqfd, 
}



static int

kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi)

kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)

{

	struct kvm_irq_routing_table *irq_rt;

	struct _irqfd *irqfd, *tmp;
@@ -212,12 +212,12 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi) 
		return -ENOMEM;



	irqfd->kvm = kvm;

	irqfd->gsi = gsi;

	irqfd->gsi = args->gsi;

	INIT_LIST_HEAD(&irqfd->list);

	INIT_WORK(&irqfd->inject, irqfd_inject);

	INIT_WORK(&irqfd->shutdown, irqfd_shutdown);



	file = eventfd_fget(fd);

	file = eventfd_fget(args->fd);

	if (IS_ERR(file)) {

		ret = PTR_ERR(file);

		goto fail;
@@ -298,19 +298,19 @@ kvm_eventfd_init(struct kvm *kvm) 
 * shutdown any irqfd's that match fd+gsi

 */

static int

kvm_irqfd_deassign(struct kvm *kvm, int fd, int gsi)

kvm_irqfd_deassign(struct kvm *kvm, struct kvm_irqfd *args)

{

	struct _irqfd *irqfd, *tmp;

	struct eventfd_ctx *eventfd;



	eventfd = eventfd_ctx_fdget(fd);

	eventfd = eventfd_ctx_fdget(args->fd);

	if (IS_ERR(eventfd))

		return PTR_ERR(eventfd);



	spin_lock_irq(&kvm->irqfds.lock);



	list_for_each_entry_safe(irqfd, tmp, &kvm->irqfds.items, list) {

		if (irqfd->eventfd == eventfd && irqfd->gsi == gsi) {

		if (irqfd->eventfd == eventfd && irqfd->gsi == args->gsi) {

			/*

			 * This rcu_assign_pointer is needed for when

			 * another thread calls kvm_irq_routing_update before
@@ -338,12 +338,12 @@ kvm_irqfd_deassign(struct kvm *kvm, int fd, int gsi) 
}



int

kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)

kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)

{

	if (flags & KVM_IRQFD_FLAG_DEASSIGN)

		return kvm_irqfd_deassign(kvm, fd, gsi);

	if (args->flags & KVM_IRQFD_FLAG_DEASSIGN)

		return kvm_irqfd_deassign(kvm, args);



	return kvm_irqfd_assign(kvm, fd, gsi);

	return kvm_irqfd_assign(kvm, args);

}



/*

virt/kvm/kvm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2047,7 +2047,7 @@ static long kvm_vm_ioctl(struct file *filp, 
		r = -EFAULT;

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

			goto out;

		r = kvm_irqfd(kvm, data.fd, data.gsi, data.flags);

		r = kvm_irqfd(kvm, &data);

		break;

	}

	case KVM_IOEVENTFD: {