From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atsu1-0001KV-9r for qemu-devel@nongnu.org; Sat, 23 Apr 2016 04:26:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atsu0-00076U-8n for qemu-devel@nongnu.org; Sat, 23 Apr 2016 04:26:57 -0400 References: <1461368452-10389-1-git-send-email-eblake@redhat.com> <1461368452-10389-22-git-send-email-eblake@redhat.com> From: "Denis V. Lunev" Message-ID: <571B2E69.9090800@openvz.org> Date: Sat, 23 Apr 2016 11:12:25 +0300 MIME-Version: 1.0 In-Reply-To: <1461368452-10389-22-git-send-email-eblake@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 21/44] block: Switch blk_write_zeroes() to byte interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, alex@alex.org.uk, Kevin Wolf , Max Reitz , Stefan Hajnoczi On 04/23/2016 02:40 AM, Eric Blake wrote: > Sector-based blk_write() should die; convert the one-off > variant blk_write_zeroes(). > > Signed-off-by: Eric Blake > --- > include/sysemu/block-backend.h | 4 ++-- > block/block-backend.c | 8 ++++---- > block/parallels.c | 3 ++- > qemu-img.c | 3 ++- > 4 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h > index 662a106..1246699 100644 > --- a/include/sysemu/block-backend.h > +++ b/include/sysemu/block-backend.h > @@ -96,8 +96,8 @@ int blk_pread_unthrottled(BlockBackend *blk, int64_t offset, uint8_t *buf, > int count); > int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf, > int nb_sectors); > -int blk_write_zeroes(BlockBackend *blk, int64_t sector_num, > - int nb_sectors, BdrvRequestFlags flags); > +int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, > + int count, BdrvRequestFlags flags); > BlockAIOCB *blk_aio_write_zeroes(BlockBackend *blk, int64_t sector_num, > int nb_sectors, BdrvRequestFlags flags, > BlockCompletionFunc *cb, void *opaque); > diff --git a/block/block-backend.c b/block/block-backend.c > index 5513b6f..ae08bd2 100644 > --- a/block/block-backend.c > +++ b/block/block-backend.c > @@ -816,11 +816,11 @@ int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf, > blk_write_entry, 0); > } > > -int blk_write_zeroes(BlockBackend *blk, int64_t sector_num, > - int nb_sectors, BdrvRequestFlags flags) > +int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, > + int count, BdrvRequestFlags flags) > { > - return blk_rw(blk, sector_num, NULL, nb_sectors, blk_write_entry, > - flags | BDRV_REQ_ZERO_WRITE); > + return blk_prw(blk, offset, NULL, count, blk_write_entry, > + flags | BDRV_REQ_ZERO_WRITE); > } > > static void error_callback_bh(void *opaque) > diff --git a/block/parallels.c b/block/parallels.c > index 2d8bc87..95bfc32 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -516,7 +516,8 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp) > if (ret < 0) { > goto exit; > } > - ret = blk_write_zeroes(file, 1, bat_sectors - 1, 0); > + ret = blk_pwrite_zeroes(file, BDRV_SECTOR_SIZE, > + (bat_sectors - 1) << BDRV_SECTOR_BITS, 0); > if (ret < 0) { > goto exit; > } > diff --git a/qemu-img.c b/qemu-img.c > index 2e4646e..376107c 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -1601,7 +1601,8 @@ static int convert_write(ImgConvertState *s, int64_t sector_num, int nb_sectors, > if (s->has_zero_init) { > break; > } > - ret = blk_write_zeroes(s->target, sector_num, n, 0); > + ret = blk_pwrite_zeroes(s->target, sector_num << BDRV_SECTOR_BITS, > + n << BDRV_SECTOR_BITS, 0); > if (ret < 0) { > return ret; > } Acked-by: Denis V. Lunev