From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3ihC-0007uO-C9 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:20:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3ih1-0003g6-Ob for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:20:46 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:59957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3ih1-0003fx-5V for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:20:35 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 29 Jul 2013 18:17:30 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id F13622CE8052 for ; Mon, 29 Jul 2013 18:20:29 +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 r6T84pA561472962 for ; Mon, 29 Jul 2013 18:04:51 +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 r6T8KTZt024958 for ; Mon, 29 Jul 2013 18:20:29 +1000 Message-ID: <51F625C7.90302@linux.vnet.ibm.com> Date: Mon, 29 Jul 2013 16:20:23 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1374765505-14356-1-git-send-email-stefanha@redhat.com> <1374765505-14356-13-git-send-email-stefanha@redhat.com> In-Reply-To: <1374765505-14356-13-git-send-email-stefanha@redhat.com> Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 12/18] block/rbd: drop qemu_rbd_aio_flush_cb() 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 qemu_rbd_aio_flush_cb(). > qemu_aio_count is unused now so drop it too. > > Signed-off-by: Stefan Hajnoczi > --- > block/rbd.c | 14 +------------- > 1 file changed, 1 insertion(+), 13 deletions(-) > > diff --git a/block/rbd.c b/block/rbd.c > index cb71751..71b4a0c 100644 > --- a/block/rbd.c > +++ b/block/rbd.c > @@ -100,7 +100,6 @@ typedef struct BDRVRBDState { > rados_ioctx_t io_ctx; > rbd_image_t image; > char name[RBD_MAX_IMAGE_NAME_SIZE]; > - int qemu_aio_count; > char *snap; > int event_reader_pos; > RADOSCB *event_rcb; > @@ -428,19 +427,11 @@ static void qemu_rbd_aio_event_reader(void *opaque) > if (s->event_reader_pos == sizeof(s->event_rcb)) { > s->event_reader_pos = 0; > qemu_rbd_complete_aio(s->event_rcb); > - s->qemu_aio_count--; > } > } > } while (ret < 0 && errno == EINTR); > } > > -static int qemu_rbd_aio_flush_cb(void *opaque) > -{ > - BDRVRBDState *s = opaque; > - > - return (s->qemu_aio_count > 0); > -} > - > /* TODO Convert to fine grained options */ > static QemuOptsList runtime_opts = { > .name = "rbd", > @@ -554,7 +545,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags) > fcntl(s->fds[0], F_SETFL, O_NONBLOCK); > fcntl(s->fds[1], F_SETFL, O_NONBLOCK); > qemu_aio_set_fd_handler(s->fds[RBD_FD_READ], qemu_rbd_aio_event_reader, > - NULL, qemu_rbd_aio_flush_cb, s); > + NULL, NULL, s); > > > qemu_opts_del(opts); > @@ -741,8 +732,6 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriverState *bs, > off = sector_num * BDRV_SECTOR_SIZE; > size = nb_sectors * BDRV_SECTOR_SIZE; > > - s->qemu_aio_count++; /* All the RADOSCB */ > - > rcb = g_malloc(sizeof(RADOSCB)); > rcb->done = 0; > rcb->acb = acb; > @@ -779,7 +768,6 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriverState *bs, > > failed: > g_free(rcb); > - s->qemu_aio_count--; > qemu_aio_release(acb); > return NULL; > } > -- Best Regards Wenchao Xia