From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxDg7-0008Mu-65 for qemu-devel@nongnu.org; Thu, 20 Oct 2016 09:46:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxDg5-0004fE-VO for qemu-devel@nongnu.org; Thu, 20 Oct 2016 09:46:39 -0400 From: Kevin Wolf Date: Thu, 20 Oct 2016 15:46:09 +0200 Message-Id: <1476971169-31604-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1476971169-31604-1-git-send-email-kwolf@redhat.com> References: <1476971169-31604-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 9/9] block: Remove bdrv_aio_ioctl() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org It is unused now. Signed-off-by: Kevin Wolf --- block/io.c | 27 --------------------------- include/block/block.h | 3 --- 2 files changed, 30 deletions(-) diff --git a/block/io.c b/block/io.c index 370c7d8..79cbbdf 100644 --- a/block/io.c +++ b/block/io.c @@ -2522,33 +2522,6 @@ out: return co.ret; } -static void coroutine_fn bdrv_co_aio_ioctl_entry(void *opaque) -{ - BlockAIOCBCoroutine *acb = opaque; - acb->req.error = bdrv_co_ioctl(acb->common.bs, - acb->req.req, acb->req.buf); - bdrv_co_complete(acb); -} - -BlockAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, - unsigned long int req, void *buf, - BlockCompletionFunc *cb, void *opaque) -{ - BlockAIOCBCoroutine *acb = qemu_aio_get(&bdrv_em_co_aiocb_info, - bs, cb, opaque); - Coroutine *co; - - acb->need_bh = true; - acb->req.error = -EINPROGRESS; - acb->req.req = req; - acb->req.buf = buf; - co = qemu_coroutine_create(bdrv_co_aio_ioctl_entry, acb); - qemu_coroutine_enter(co); - - bdrv_co_maybe_schedule_bh(acb); - return &acb->common; -} - void *qemu_blockalign(BlockDriverState *bs, size_t size) { return qemu_memalign(bdrv_opt_mem_align(bs), size); diff --git a/include/block/block.h b/include/block/block.h index e0a54aa..398a050 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -319,9 +319,6 @@ void bdrv_aio_cancel_async(BlockAIOCB *acb); /* sg packet commands */ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); -BlockAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, - unsigned long int req, void *buf, - BlockCompletionFunc *cb, void *opaque); /* Invalidate any cached metadata used by image formats */ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp); -- 1.8.3.1