From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X07mK-0002Zo-Q0 for qemu-devel@nongnu.org; Thu, 26 Jun 2014 07:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X07m7-0000re-DO for qemu-devel@nongnu.org; Thu, 26 Jun 2014 07:23:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X07m7-0000rE-5l for qemu-devel@nongnu.org; Thu, 26 Jun 2014 07:23:31 -0400 From: Markus Armbruster Date: Thu, 26 Jun 2014 13:23:18 +0200 Message-Id: <1403781805-17171-4-git-send-email-armbru@redhat.com> In-Reply-To: <1403781805-17171-1-git-send-email-armbru@redhat.com> References: <1403781805-17171-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v5 03/10] block: Use bdrv_nb_sectors() in bdrv_make_zero() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit@irqsave.net, stefanha@redhat.com, mreitz@redhat.com Instead of bdrv_getlength(). Variable target_size is initially in bytes, then changes meaning to sectors. Ugh. Replace by target_sectors. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Benoit Canet --- block.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index e1808ef..51dc65e 100644 --- a/block.c +++ b/block.c @@ -2824,18 +2824,16 @@ int bdrv_write_zeroes(BlockDriverState *bs, int64_t sector_num, */ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) { - int64_t target_size; - int64_t ret, nb_sectors, sector_num = 0; + int64_t target_sectors, ret, nb_sectors, sector_num = 0; int n; - target_size = bdrv_getlength(bs); - if (target_size < 0) { - return target_size; + target_sectors = bdrv_nb_sectors(bs); + if (target_sectors < 0) { + return target_sectors; } - target_size /= BDRV_SECTOR_SIZE; for (;;) { - nb_sectors = target_size - sector_num; + nb_sectors = target_sectors - sector_num; if (nb_sectors <= 0) { return 0; } -- 1.9.3