From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3igW-0006v2-T9 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3igN-0003MA-Ib for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:20:04 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:33261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3igM-0003Ll-Ve for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:19:55 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 29 Jul 2013 18:03:53 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 4B5FE357804E for ; Mon, 29 Jul 2013 18:19:48 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6T849Om60227724 for ; Mon, 29 Jul 2013 18:04:09 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r6T8JlRp023564 for ; Mon, 29 Jul 2013 18:19:47 +1000 Message-ID: <51F6259D.7040309@linux.vnet.ibm.com> Date: Mon, 29 Jul 2013 16:19:41 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1374765505-14356-1-git-send-email-stefanha@redhat.com> <1374765505-14356-12-git-send-email-stefanha@redhat.com> In-Reply-To: <1374765505-14356-12-git-send-email-stefanha@redhat.com> Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 11/18] block/nbd: drop nbd_have_request() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , Ping Fan Liu , qemu-devel@nongnu.org, Michael Roth , alex@alex.org.uk, Paolo Bonzini Reviewed-by: Wenchao Xia > .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 9c480b8..f1619f9 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -279,13 +279,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; > @@ -342,7 +335,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); > if (qiov) { > if (!s->is_unix) { > socket_set_cork(s->sock, 1); > @@ -362,7 +355,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request, > rc = nbd_send_request(s->sock, 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; > @@ -439,7 +432,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; > -- Best Regards Wenchao Xia