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

Commit ca0488aa authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Paolo Bonzini
Browse files

kvm: don't redefine flags as something else 



The function irqfd_wakeup() has flags defined as __poll_t and then it
has additional flags which is used for irqflags.

Redefine the inner flags variable as iflags so it does not shadow the
outer flags.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f285c633

virt/kvm/eventfd.c

+3 −3
Original line number Diff line number Diff line
@@ -214,9 +214,9 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key) 


	if (flags & EPOLLHUP) {

		/* The eventfd is closing, detach from KVM */

		unsigned long flags;

		unsigned long iflags;



		spin_lock_irqsave(&kvm->irqfds.lock, flags);

		spin_lock_irqsave(&kvm->irqfds.lock, iflags);



		/*

		 * We must check if someone deactivated the irqfd before
@@ -230,7 +230,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key) 
		if (irqfd_is_active(irqfd))

			irqfd_deactivate(irqfd);



		spin_unlock_irqrestore(&kvm->irqfds.lock, flags);

		spin_unlock_irqrestore(&kvm->irqfds.lock, iflags);

	}



	return 0;