diff options
author | Mark McLoughlin <markmc@redhat.com> | 2009-10-28 11:41:55 +0000 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2009-10-28 11:41:55 +0000 |
commit | abe5224ddedc058fc780b0f288d0bb277d514510 (patch) | |
tree | f962fc4f8534fc4bbde643ce8ae260e35039fdee /posix-aio-compat.c | |
parent | Merge commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10' into upstream-merge (diff) | |
parent | Add qemu_aio_process_queue() (diff) | |
download | qemu-kvm-abe5224ddedc058fc780b0f288d0bb277d514510.tar.gz qemu-kvm-abe5224ddedc058fc780b0f288d0bb277d514510.tar.bz2 qemu-kvm-abe5224ddedc058fc780b0f288d0bb277d514510.zip |
Merge commit '8febfa26846e75d38848255028dfe2d06e5ba941' into upstream-merge
* commit '8febfa26846e75d38848255028dfe2d06e5ba941':
Add qemu_aio_process_queue()
Conflicts:
posix-aio-compat.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'posix-aio-compat.c')
-rw-r--r-- | posix-aio-compat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/posix-aio-compat.c b/posix-aio-compat.c index 4007be376..90ed32ced 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -621,7 +621,8 @@ void *paio_init(void) fcntl(s->fd, F_SETFL, O_NONBLOCK); - qemu_aio_set_fd_handler(s->fd, posix_aio_read, NULL, posix_aio_flush, s); + qemu_aio_set_fd_handler(s->fd, posix_aio_read, NULL, posix_aio_flush, + posix_aio_process_queue, s); ret = pthread_attr_init(&attr); if (ret) |