Kevin Wolf <kw...@redhat.com> writes:
> Am 21.08.2014 um 08:43 hat Markus Armbruster geschrieben:
>> Fam Zheng <f...@redhat.com> 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 <arm...@redhat.com>
>> >> ---
>> >> 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.
>
> The worst part is that it got a Reviewed-by which might just have fooled
> me if Fam hadn't reviewed it as well. :-/
This kind of idiotic error is hard to spot in review for the same reason
it's easy to make 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.
>
> Well, you know what you have to do for v2, right? qemu-iotests is
> in-tree for a reason.
All right, "./check -T -vmdk -g quick" would've caught this.
I tried it with -nocache first, because that's how tests/check-block.sh
runs it, but that fails due to a bug we traced back to raw-posix in
#qemu. Stefan is taking care of it.
Looks like check-block.sh hasn't been used much lately. I didn't know
it existed until it showed up in a grep.
I'll respin this patch. I'll discuss improving "make check-block" in a
new thread.
