Am 01.03.2018 um 17:27 hat Alberto Garcia geschrieben:
> This function iterates over all snapshots of a qcow2 file in order to
> expand all zero clusters, but it does not validate the snapshots' L1
> tables first.
>
> We now have a function to take care of this, so let's use it.
>
> We can also take the opportunity to replace the sector-based
> bdrv_read() with bdrv_pread().
>
> Signed-off-by: Alberto Garcia <be...@igalia.com>
> ---
> block/qcow2-cluster.c | 20 +++++++++++++-------
> tests/qemu-iotests/080 | 2 ++
> tests/qemu-iotests/080.out | 2 ++
> 3 files changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
> index e406b0f3b9..40167ac09c 100644
> --- a/block/qcow2-cluster.c
> +++ b/block/qcow2-cluster.c
> @@ -2092,11 +2092,18 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs,
> }
>
> for (i = 0; i < s->nb_snapshots; i++) {
> - int l1_sectors = DIV_ROUND_UP(s->snapshots[i].l1_size *
> - sizeof(uint64_t), BDRV_SECTOR_SIZE);
> + int l1_size2;
> + uint64_t *new_l1_table;
>
> - uint64_t *new_l1_table =
> - g_try_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE);
> + ret = qcow2_validate_table(bs, s->snapshots[i].l1_table_offset,
> + s->snapshots[i].l1_size, sizeof(uint64_t),
> + QCOW_MAX_L1_SIZE, "", NULL);
> + if (ret < 0) {
> + return ret;
Shouldn't this be goto fail?
Kevin
