Re: [Qemu-devel] [PATCH 1/1] vmdk: Use bdrv_nb_sectors() where sectors, not bytes are wanted

[Fam Zheng]

On Thu, 08/21 08:43, Markus Armbruster wrote:
> Fam Zheng <address@hidden> writes:
> 
> > On Wed, 08/20 19:07, Markus Armbruster wrote:
> >> Instead of bdrv_getlength().
> >> 
> >> Commit 57322b7 did this all over block, but one more bdrv_getlength()
> >> has crept in since.
> >> 
> >> Signed-off-by: Markus Armbruster <address@hidden>
> >> ---
> >>  block/vmdk.c | 11 +++++------
> >>  1 file changed, 5 insertions(+), 6 deletions(-)
> >> 
> >> diff --git a/block/vmdk.c b/block/vmdk.c
> >> index 01412a8..3b74e85 100644
> >> --- a/block/vmdk.c
> >> +++ b/block/vmdk.c
> >> @@ -397,7 +397,7 @@ static int vmdk_add_extent(BlockDriverState *bs,
> >>  {
> >>      VmdkExtent *extent;
> >>      BDRVVmdkState *s = bs->opaque;
> >> -    int64_t length;
> >> +    int64_t nb_sectors;
> >>  
> >>      if (cluster_sectors > 0x200000) {
> >>          /* 0x200000 * 512Bytes = 1GB for one cluster is unrealistic */
> >> @@ -413,9 +413,9 @@ static int vmdk_add_extent(BlockDriverState *bs,
> >>          return -EFBIG;
> >>      }
> >>  
> >> -    length = bdrv_getlength(file);
> >> -    if (length < 0) {
> >> -        return length;
> >> +    nb_sectors = bdrv_getlength(file);
> >
> > Should be bdrv_nb_sectors.
> 
> Brown paperbag...  I shouldn't do "trivial" patches when tired.
> 
> I wish "make check-block" covered a bit more, or there was something
> that does while being trivial enough for me to run it unthinkingly.
> 

The test case here would be "write a little more data to the image, assert that
the file size (EOF offset) doesn't explode". :)

Fam