From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGXdZ-0003m4-Op for qemu-devel@nongnu.org; Wed, 19 Oct 2011 11:00:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGXdO-0006MQ-7P for qemu-devel@nongnu.org; Wed, 19 Oct 2011 11:00:52 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:33390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGXdN-0006GE-TB for qemu-devel@nongnu.org; Wed, 19 Oct 2011 11:00:46 -0400 Received: by mail-qy0-f173.google.com with SMTP id 10so4228308qyk.4 for ; Wed, 19 Oct 2011 08:00:45 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 19 Oct 2011 16:59:58 +0200 Message-Id: <1319036398-14320-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1319036398-14320-1-git-send-email-pbonzini@redhat.com> References: <1319036398-14320-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 8/8] block: change discard to co_discard List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com Since coroutine operation is now mandatory, convert both bdrv_discard implementations to coroutines. For qcow2, this means taking the lock around the operation. raw-posix remains synchronous. The bdrv_discard callback is then unused and can be eliminated. Signed-off-by: Paolo Bonzini --- block.c | 2 -- block/qcow2.c | 12 +++++++++--- block/raw-posix.c | 4 ++-- block_int.h | 2 -- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index 81fb709..70aab63 100644 --- a/block.c +++ b/block.c @@ -2962,8 +2962,6 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, qemu_coroutine_yield(); return co.ret; } - } else if (bs->drv->bdrv_discard) { - return bs->drv->bdrv_discard(bs, sector_num, nb_sectors); } else { return 0; } diff --git a/block/qcow2.c b/block/qcow2.c index 3758dbf..0832d11 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -978,11 +978,17 @@ static int qcow2_make_empty(BlockDriverState *bs) return 0; } -static int qcow2_discard(BlockDriverState *bs, int64_t sector_num, - int nb_sectors) +static coroutine_fn int qcow2_co_discard(BlockDriverState *bs, + int64_t sector_num, int nb_sectors) { - return qcow2_discard_clusters(bs, sector_num << BDRV_SECTOR_BITS, + int ret; + BDRVQcowState *s = bs->opaque; + + qemu_co_mutex_lock(&s->lock); + ret = qcow2_discard_clusters(bs, sector_num << BDRV_SECTOR_BITS, nb_sectors); + qemu_co_mutex_unlock(&s->lock); + return ret; } static int qcow2_truncate(BlockDriverState *bs, int64_t offset) @@ -1232,7 +1238,7 @@ static BlockDriver bdrv_qcow2 = { .bdrv_co_writev = qcow2_co_writev, .bdrv_co_flush = qcow2_co_flush, - .bdrv_discard = qcow2_discard, + .bdrv_co_discard = qcow2_co_discard, .bdrv_truncate = qcow2_truncate, .bdrv_write_compressed = qcow2_write_compressed, diff --git a/block/raw-posix.c b/block/raw-posix.c index afcb4c1..cf337f7 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -602,7 +602,8 @@ static int xfs_discard(BDRVRawState *s, int64_t sector_num, int nb_sectors) } #endif -static int raw_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) +static coroutine_fn int raw_co_discard(BlockDriverState *bs, + int64_t sector_num, int nb_sectors) { #ifdef CONFIG_XFS BDRVRawState *s = bs->opaque; @@ -632,7 +632,7 @@ static BlockDriver bdrv_file = { .bdrv_file_open = raw_open, .bdrv_close = raw_close, .bdrv_create = raw_create, - .bdrv_discard = raw_discard, + .bdrv_co_discard = raw_co_discard, .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, diff --git a/block_int.h b/block_int.h index bc3b07e..dac00f5 100644 --- a/block_int.h +++ b/block_int.h @@ -62,8 +62,6 @@ struct BlockDriver { const uint8_t *buf, int nb_sectors); void (*bdrv_close)(BlockDriverState *bs); int (*bdrv_create)(const char *filename, QEMUOptionParameter *options); - int (*bdrv_discard)(BlockDriverState *bs, int64_t sector_num, - int nb_sectors); int (*bdrv_is_allocated)(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum); int (*bdrv_set_key)(BlockDriverState *bs, const char *key); -- 1.7.6