From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b81EI-0008HK-IY for qemu-devel@nongnu.org; Wed, 01 Jun 2016 04:10:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b81EG-00055R-E4 for qemu-devel@nongnu.org; Wed, 01 Jun 2016 04:10:17 -0400 References: <20160601015223.19277-1-famz@redhat.com> From: Paolo Bonzini Message-ID: <0e6d20b4-db2a-4966-e591-f4c1d09015fa@redhat.com> Date: Wed, 1 Jun 2016 10:10:05 +0200 MIME-Version: 1.0 In-Reply-To: <20160601015223.19277-1-famz@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] block: Drop bdrv_ioctl_bh_cb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Kevin Wolf , Max Reitz , qemu-block@nongnu.org, qemu-stable@nongnu.org On 01/06/2016 03:52, Fam Zheng wrote: > Similar to the "!drv || !drv->bdrv_aio_ioctl" case above, here it is > okay to set co.ret and return. As pointed out by Paolo, a BH will be > created as necessary by the caller (bdrv_co_maybe_schedule_bh). > Besides, as pointed out by Kevin, "data" was leaked before. > > Reported-by: Kevin Wolf > Reported-by: Paolo Bonzini > Signed-off-by: Fam Zheng > --- > block/io.c | 20 ++------------------ > 1 file changed, 2 insertions(+), 18 deletions(-) > > diff --git a/block/io.c b/block/io.c > index 2d832aa..c32f5b7 100644 > --- a/block/io.c > +++ b/block/io.c > @@ -2309,19 +2309,6 @@ int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) > return rwco.ret; > } > > -typedef struct { > - CoroutineIOCompletion *co; > - QEMUBH *bh; > -} BdrvIoctlCompletionData; > - > -static void bdrv_ioctl_bh_cb(void *opaque) > -{ > - BdrvIoctlCompletionData *data = opaque; > - > - bdrv_co_io_em_complete(data->co, -ENOTSUP); > - qemu_bh_delete(data->bh); > -} > - > static int bdrv_co_do_ioctl(BlockDriverState *bs, int req, void *buf) > { > BlockDriver *drv = bs->drv; > @@ -2339,11 +2326,8 @@ static int bdrv_co_do_ioctl(BlockDriverState *bs, int req, void *buf) > > acb = drv->bdrv_aio_ioctl(bs, req, buf, bdrv_co_io_em_complete, &co); > if (!acb) { > - BdrvIoctlCompletionData *data = g_new(BdrvIoctlCompletionData, 1); > - data->bh = aio_bh_new(bdrv_get_aio_context(bs), > - bdrv_ioctl_bh_cb, data); > - data->co = &co; > - qemu_bh_schedule(data->bh); > + co.ret = -ENOTSUP; > + goto out; > } > qemu_coroutine_yield(); > out: > Reviewed-by: Paolo Bonzini