Received: from eggs.gnu.org ([208.118.235.92]:43065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGWLd-0008Qk-UF for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:15:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGWLV-0004FJ-6D for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:15:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGWLU-0004F7-Sm for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:15:01 -0400 From: Stefan Hajnoczi Date: Fri, 15 Mar 2013 16:14:14 +0100 Message-Id: <1363360465-5247-18-git-send-email-stefanha@redhat.com> In-Reply-To: <1363360465-5247-1-git-send-email-stefanha@redhat.com> References: <1363360465-5247-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 17/28] sheepdog: set io_flush handler in do_co_req List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori From: MORITA Kazutaka If an io_flush handler is not set, qemu_aio_wait doesn't invoke callbacks. Signed-off-by: MORITA Kazutaka Signed-off-by: Stefan Hajnoczi --- block/sheepdog.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 27abef2..4245328 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -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; @@ -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)) { @@ -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; -- 1.8.1.4