From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TulwU-000401-FO for qemu-devel@nongnu.org; Mon, 14 Jan 2013 10:27:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TulwO-0002mS-0Z for qemu-devel@nongnu.org; Mon, 14 Jan 2013 10:27:18 -0500 Received: from mail-qa0-f42.google.com ([209.85.216.42]:36209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TulwN-0002mK-TA for qemu-devel@nongnu.org; Mon, 14 Jan 2013 10:27:11 -0500 Received: by mail-qa0-f42.google.com with SMTP id hg5so1528802qab.1 for ; Mon, 14 Jan 2013 07:27:11 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 14 Jan 2013 16:26:54 +0100 Message-Id: <1358177218-16802-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1358177218-16802-1-git-send-email-pbonzini@redhat.com> References: <1358177218-16802-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 3/7] raw: support discard on block devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com Block devices use a ioctl instead of fallocate, so add a separate implementation. Signed-off-by: Paolo Bonzini --- block/raw-posix.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/block/raw-posix.c b/block/raw-posix.c index b647cfb..1d32139 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1345,6 +1345,40 @@ static BlockDriverAIOCB *hdev_aio_ioctl(BlockDriverState *bs, return thread_pool_submit_aio(aio_worker, acb, cb, opaque); } +static coroutine_fn int hdev_co_discard(BlockDriverState *bs, + int64_t sector_num, int nb_sectors) +{ + BDRVRawState *s = bs->opaque; + int ret; + + if (s->has_discard == 0) { + return 0; + } + ret = fd_open(bs); + if (ret < 0) { + return ret; + } + + ret = -EOPNOTSUPP; +#ifdef BLKDISCARD + do { + uint64_t range[2] = { sector_num * 512, (uint64_t)nb_sectors * 512 }; + if (ioctl(s->fd, BLKDISCARD, range) == 0) { + return 0; + } + } while (errno == EINTR); + + ret = -errno; +#endif + if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP || + ret == -ENOTTY) { + s->has_discard = 0; + ret = 0; + } + return ret; + +} + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) static int fd_open(BlockDriverState *bs) { @@ -1413,6 +1447,8 @@ static BlockDriver bdrv_host_device = { .create_options = raw_create_options, .bdrv_has_zero_init = hdev_has_zero_init, + .bdrv_co_discard = hdev_co_discard, + .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, .bdrv_aio_flush = raw_aio_flush, -- 1.8.1