From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQJhN-0004bI-QE for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:46:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQJhH-0002vk-AA for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:46:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQJhG-0002vR-W9 for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:45:59 -0400 From: Stefan Hajnoczi Date: Thu, 11 Apr 2013 17:44:40 +0200 Message-Id: <1365695085-27970-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1365695085-27970-1-git-send-email-stefanha@redhat.com> References: <1365695085-27970-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [RFC 08/13] block/nbd: drop nbd_have_request() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Anthony Liguori , pingfank@linux.vnet.ibm.com .io_flush() is no longer called so drop nbd_have_request(). We cannot drop in_flight since it is still used by other block/nbd.c code. Signed-off-by: Stefan Hajnoczi --- block/nbd.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index eff683c..7830aa4 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -270,13 +270,6 @@ static void nbd_coroutine_start(BDRVNBDState *s, struct nbd_request *request) request->handle = INDEX_TO_HANDLE(s, i); } -static int nbd_have_request(void *opaque) -{ - BDRVNBDState *s = opaque; - - return s->in_flight > 0; -} - static void nbd_reply_ready(void *opaque) { BDRVNBDState *s = opaque; @@ -333,7 +326,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request, qemu_co_mutex_lock(&s->send_mutex); s->send_coroutine = qemu_coroutine_self(); qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write, - nbd_have_request, s); + NULL, s); rc = nbd_send_request(s->sock, request); if (rc >= 0 && qiov) { ret = qemu_co_sendv(s->sock, qiov->iov, qiov->niov, @@ -343,7 +336,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request, } } qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL, - nbd_have_request, s); + NULL, s); s->send_coroutine = NULL; qemu_co_mutex_unlock(&s->send_mutex); return rc; @@ -417,7 +410,7 @@ static int nbd_establish_connection(BlockDriverState *bs) * kick the reply mechanism. */ qemu_set_nonblock(sock); qemu_aio_set_fd_handler(sock, nbd_reply_ready, NULL, - nbd_have_request, s); + NULL, s); s->sock = sock; s->size = size; -- 1.8.1.4