KVM: fix irqfd error checking
Michael Tsirkin pointed out that f_ops->poll() does not return a standard
"int" error, yet we are treating it as such. Lets fix this.
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index a0e329f..a9e7de7 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -144,6 +144,7 @@
struct _irqfd *irqfd;
struct file *file = NULL;
int ret;
+ unsigned int events;
irqfd = kzalloc(sizeof(*irqfd), GFP_KERNEL);
if (!irqfd)
@@ -169,9 +170,7 @@
init_waitqueue_func_entry(&irqfd->wait, irqfd_wakeup);
init_poll_funcptr(&irqfd->pt, irqfd_ptable_queue_proc);
- ret = file->f_op->poll(file, &irqfd->pt);
- if (ret < 0)
- goto fail;
+ events = file->f_op->poll(file, &irqfd->pt);
kvm_get_kvm(kvm);
@@ -180,6 +179,12 @@
mutex_unlock(&kvm->lock);
/*
+ * Check if there was an event already queued
+ */
+ if (events & POLLIN)
+ schedule_work(&irqfd->inject);
+
+ /*
* do not drop the file until the irqfd is fully initialized, otherwise
* we might race against the POLLHUP
*/
@@ -188,9 +193,6 @@
return 0;
fail:
- if (irqfd->wqh)
- remove_wait_queue(irqfd->wqh, &irqfd->wait);
-
if (file && !IS_ERR(file))
fput(file);
