Skip to content

Commit

Permalink
sheepdog: set io_flush handler in do_co_req
Browse files Browse the repository at this point in the history
If an io_flush handler is not set, qemu_aio_wait doesn't invoke
callbacks.

Signed-off-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
kazum authored and stefanhaRH committed Mar 15, 2013
1 parent 0d6db30 commit ed9ba72
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions block/sheepdog.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,13 @@ static void restart_co_req(void *opaque)
qemu_coroutine_enter(co, NULL);
}

static int have_co_req(void *opaque)
{
/* this handler is set only when there is a pending request, so
* always returns 1. */
return 1;
}

typedef struct SheepdogReqCo {
int sockfd;
SheepdogReq *hdr;
Expand All @@ -523,14 +530,14 @@ static coroutine_fn void do_co_req(void *opaque)
unsigned int *rlen = srco->rlen;

co = qemu_coroutine_self();
qemu_aio_set_fd_handler(sockfd, NULL, restart_co_req, NULL, co);
qemu_aio_set_fd_handler(sockfd, NULL, restart_co_req, have_co_req, co);

ret = send_co_req(sockfd, hdr, data, wlen);
if (ret < 0) {
goto out;
}

qemu_aio_set_fd_handler(sockfd, restart_co_req, NULL, NULL, co);
qemu_aio_set_fd_handler(sockfd, restart_co_req, NULL, have_co_req, co);

ret = qemu_co_recv(sockfd, hdr, sizeof(*hdr));
if (ret < sizeof(*hdr)) {
Expand All @@ -553,6 +560,8 @@ static coroutine_fn void do_co_req(void *opaque)
}
ret = 0;
out:
/* there is at most one request for this sockfd, so it is safe to
* set each handler to NULL. */
qemu_aio_set_fd_handler(sockfd, NULL, NULL, NULL, NULL);

srco->ret = ret;
Expand Down

0 comments on commit ed9ba72

Please sign in to comment.