From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxDg0-00084m-KZ for qemu-devel@nongnu.org; Thu, 20 Oct 2016 09:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxDfz-0004dK-QP for qemu-devel@nongnu.org; Thu, 20 Oct 2016 09:46:32 -0400 From: Kevin Wolf Date: Thu, 20 Oct 2016 15:46:06 +0200 Message-Id: <1476971169-31604-7-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 6/9] block: Remove bdrv_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 | 37 ------------------------------------- include/block/block.h | 1 - 2 files changed, 38 deletions(-) diff --git a/block/io.c b/block/io.c index 7c119d5..35fdcca 100644 --- a/block/io.c +++ b/block/io.c @@ -2518,43 +2518,6 @@ out: return co.ret; } -typedef struct { - BlockDriverState *bs; - int req; - void *buf; - int ret; -} BdrvIoctlCoData; - -static void coroutine_fn bdrv_co_ioctl_entry(void *opaque) -{ - BdrvIoctlCoData *data = opaque; - data->ret = bdrv_co_ioctl(data->bs, data->req, data->buf); -} - -/* needed for generic scsi interface */ -int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) -{ - BdrvIoctlCoData data = { - .bs = bs, - .req = req, - .buf = buf, - .ret = -EINPROGRESS, - }; - - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - bdrv_co_ioctl_entry(&data); - } else { - Coroutine *co = qemu_coroutine_create(bdrv_co_ioctl_entry, &data); - - qemu_coroutine_enter(co); - while (data.ret == -EINPROGRESS) { - aio_poll(bdrv_get_aio_context(bs), true); - } - } - return data.ret; -} - static void coroutine_fn bdrv_co_aio_ioctl_entry(void *opaque) { BlockAIOCBCoroutine *acb = opaque; diff --git a/include/block/block.h b/include/block/block.h index e06db62..e0a54aa 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -319,7 +319,6 @@ void bdrv_aio_cancel_async(BlockAIOCB *acb); /* sg packet commands */ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); -int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf); BlockAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, unsigned long int req, void *buf, BlockCompletionFunc *cb, void *opaque); -- 1.8.3.1