diff options
| author | Gregory Haskins <ghaskins@novell.com> | 2009-06-18 13:44:21 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-21 15:55:54 +0300 |
| commit | 4631e094c00446f4e0ace8bcb4d60306ac8156c1 (patch) | |
| tree | d52b574346abab9f9d83f5f93209c1e8c203f980 | |
| parent | 9e5f8634fecb61afd19a96bfc600554f114f659c (diff) | |
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>
| -rw-r--r-- | virt/kvm/eventfd.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index a0e329f6944c..a9e7de73b83f 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -144,6 +144,7 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags) struct _irqfd *irqfd; struct file *file = NULL; int ret; + unsigned int events; irqfd = kzalloc(sizeof(*irqfd), GFP_KERNEL); if (!irqfd) @@ -169,9 +170,7 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags) 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 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags) 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 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags) return 0; fail: - if (irqfd->wqh) - remove_wait_queue(irqfd->wqh, &irqfd->wait); - if (file && !IS_ERR(file)) fput(file); |