From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrTe3-0002oU-7q for qemu-devel@nongnu.org; Mon, 02 Jun 2014 10:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WrTdw-0007v3-8J for qemu-devel@nongnu.org; Mon, 02 Jun 2014 10:55:27 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38626 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrTdw-0007uw-3G for qemu-devel@nongnu.org; Mon, 02 Jun 2014 10:55:20 -0400 Date: Mon, 2 Jun 2014 16:55:19 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140602145518.GC8181@irqsave.net> References: <1401473631-10724-1-git-send-email-armbru@redhat.com> <1401473631-10724-4-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1401473631-10724-4-git-send-email-armbru@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 03/10] block: Use bdrv_nb_sectors() in bdrv_make_zero() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, mreitz@redhat.com The Friday 30 May 2014 =E0 20:13:44 (+0200), Markus Armbruster wrote : > Instead of bdrv_getlength(). >=20 > Variable target_size is initially in bytes, then changes meaning to > sectors. Ugh. Replace by target_sectors. >=20 > Signed-off-by: Markus Armbruster > Reviewed-by: Eric Blake > --- > block.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) >=20 > diff --git a/block.c b/block.c > index 14dc5fe..9517108 100644 > --- a/block.c > +++ b/block.c > @@ -2855,18 +2855,16 @@ int bdrv_write_zeroes(BlockDriverState *bs, int= 64_t sector_num, > */ > int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) > { > - int64_t target_size; > - int64_t ret, nb_sectors, sector_num =3D 0; > + int64_t target_sectors, ret, nb_sectors, sector_num =3D 0; > int n; > =20 > - target_size =3D bdrv_getlength(bs); > - if (target_size < 0) { > - return target_size; > + target_sectors =3D bdrv_nb_sectors(bs); > + if (target_sectors < 0) { > + return target_sectors; > } > - target_size /=3D BDRV_SECTOR_SIZE; > =20 > for (;;) { > - nb_sectors =3D target_size - sector_num; > + nb_sectors =3D target_sectors - sector_num; > if (nb_sectors <=3D 0) { > return 0; > } > --=20 > 1.9.3 >=20 >=20 Reviewed-by: Benoit Canet