qcow2: Use macros for the L1, refcount and bitmap table entry sizes
PATCH 1/1 qcow2: Use macros for the L1, refcount and bitmap table entry sizes
This patch replaces instances of sizeof(uint64_t) in the qcow2 driver with macros that indicate what those sizes are actually referring to.
--- block/qcow2.h | 6 +++ block/qcow2-bitmap.c | 11 ++++-- block/qcow2-cluster.c | 24 ++++++------ block/qcow2-refcount.c | 89 ++++++++++++++++++++++-------------------- block/qcow2-snapshot.c | 20 +++++----- block/qcow2.c | 27 ++++++------- 6 files changed, 94 insertions(+), 83 deletions(-)
block/qcow2.h +6 -0
@@ -99,6 +99,12 @@#define L2E_SIZE_NORMAL (sizeof(uint64_t))#define L2E_SIZE_EXTENDED (sizeof(uint64_t) * 2) +/* Size of L1 table entries */ +#define L1E_SIZE (sizeof(uint64_t)) + +/* Size of reftable entries */ +#define REFTABLE_ENTRY_SIZE (sizeof(uint64_t)) +#define MIN_CLUSTER_BITS 9#define MAX_CLUSTER_BITS 21
block/qcow2-bitmap.c +7 -4
@@ -42,6 +42,9 @@#define BME_MIN_GRANULARITY_BITS 9#define BME_MAX_NAME_SIZE 1023 +/* Size of bitmap table entries */ +#define BME_TABLE_ENTRY_SIZE (sizeof(uint64_t)) +QEMU_BUILD_BUG_ON (BME_MAX_NAME_SIZE !=BDRV_BITMAP_MAX_NAME_SIZE );#if BME_MAX_TABLE_SIZE *8ULL >INT_MAX
@@ -232,7 +235,7 @@ static int bitmap_table_load(BlockDriverState *bs, Qcow2BitmapTable *tb,assert (tb->size <=BME_MAX_TABLE_SIZE ); ret =bdrv_pread (bs->file, tb->offset, - table, tb->size *sizeof (uint64_t )); + table, tb->size *BME_TABLE_ENTRY_SIZE );if (ret <0 ) { goto fail; }
@@ -265,7 +268,7 @@ static int free_bitmap_clusters(BlockDriverState *bs, Qcow2BitmapTable *tb) }clear_bitmap_table (bs, bitmap_table, tb->size); -qcow2_free_clusters (bs, tb->offset, tb->size *sizeof (uint64_t ), +qcow2_free_clusters (bs, tb->offset, tb->size *BME_TABLE_ENTRY_SIZE ,QCOW2_DISCARD_OTHER );g_free (bitmap_table);
@@ -690,7 +693,7 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs, BdrvCheckResult *res, ret =qcow2_inc_refcounts_imrt (bs, res, refcount_table, refcount_table_size, bm->table.offset, - bm->table.size *sizeof (uint64_t )); + bm->table.size *BME_TABLE_ENTRY_SIZE );if (ret <0 ) { goto out; }
@@ -1797,7 +1800,7 @@ uint64_t qcow2_get_persistent_dirty_bitmap_size(BlockDriverState *in_bs,/* Assume the entire bitmap is allocated */ bitmaps_size += bmclusters * cluster_size;/* Also reserve space for the bitmap table entries */ - bitmaps_size +=ROUND_UP (bmclusters *sizeof (uint64_t ), + bitmaps_size +=ROUND_UP (bmclusters *BME_TABLE_ENTRY_SIZE , cluster_size);/* And space for contribution to bitmap directory size */ bitmap_dir_size +=calc_dir_entry_size (strlen (name),0 );
block/qcow2-cluster.c +12 -12
@@ -47,8 +47,8 @@ int qcow2_shrink_l1_table(BlockDriverState *bs, uint64_t exact_size)BLKDBG_EVENT (bs->file,BLKDBG_L1_SHRINK_WRITE_TABLE ); ret =bdrv_pwrite_zeroes (bs->file, s->l1_table_offset + - new_l1_size *sizeof (uint64_t ), - (s->l1_size - new_l1_size) *sizeof (uint64_t ),0 ); + new_l1_size *L1E_SIZE , + (s->l1_size - new_l1_size) *L1E_SIZE ,0 );if (ret <0 ) { goto fail; }
@@ -76,7 +76,7 @@ fail:* l1_table in memory to avoid possible image corruption. */ memset (s->l1_table + new_l1_size,0 , - (s->l1_size - new_l1_size) *sizeof (uint64_t )); + (s->l1_size - new_l1_size) *L1E_SIZE );return ret; }
@@ -96,7 +96,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,/* Do a sanity check on min_size before trying to calculate new_l1_size * (this prevents overflows during the while loop for the calculation of * new_l1_size) */ -if (min_size >INT_MAX /sizeof (uint64_t )) { +if (min_size >INT_MAX /L1E_SIZE ) {return -EFBIG ; }
@@ -114,7 +114,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, }QEMU_BUILD_BUG_ON (QCOW_MAX_L1_SIZE >INT_MAX ); -if (new_l1_size >QCOW_MAX_L1_SIZE /sizeof (uint64_t )) { +if (new_l1_size >QCOW_MAX_L1_SIZE /L1E_SIZE ) {return -EFBIG ; }
@@ -123,7 +123,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, s->l1_size, new_l1_size);#endif - new_l1_size2 =sizeof (uint64_t ) * new_l1_size; + new_l1_size2 =L1E_SIZE * new_l1_size; new_l1_table =qemu_try_blockalign (bs->file->bs, new_l1_size2);if (new_l1_table ==NULL ) {return -ENOMEM ;
@@ -131,7 +131,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,memset (new_l1_table,0 , new_l1_size2);if (s->l1_size) { -memcpy (new_l1_table, s->l1_table, s->l1_size *sizeof (uint64_t )); +memcpy (new_l1_table, s->l1_table, s->l1_size *L1E_SIZE ); }/* write new table (align to cluster) */
@@ -180,7 +180,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, s->l1_table = new_l1_table; old_l1_size = s->l1_size; s->l1_size = new_l1_size; -qcow2_free_clusters (bs, old_l1_table_offset, old_l1_size *sizeof (uint64_t ), +qcow2_free_clusters (bs, old_l1_table_offset, old_l1_size *L1E_SIZE ,QCOW2_DISCARD_OTHER );return 0 ; fail:
@@ -225,9 +225,9 @@ int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index)BDRVQcow2State *s = bs->opaque;int l1_start_index;int i, ret; -int bufsize =MAX (sizeof (uint64_t ), +int bufsize =MAX (L1E_SIZE ,MIN (bs->file->bs->bl.request_alignment, s->cluster_size)); -int nentries = bufsize /sizeof (uint64_t ); +int nentries = bufsize /L1E_SIZE ; g_autofree uint64_t *buf = g_try_new0(uint64_t, nentries);if (buf ==NULL ) {
@@ -2409,7 +2409,7 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs,Error *local_err =NULL ; ret =qcow2_validate_table (bs, s->snapshots[i].l1_table_offset, - s->snapshots[i].l1_size,sizeof (uint64_t ), + s->snapshots[i].l1_size,L1E_SIZE ,QCOW_MAX_L1_SIZE ,"Snapshot L1 table" , &local_err);if (ret <0 ) {
@@ -2417,7 +2417,7 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs, goto fail; } - l1_size2 = s->snapshots[i].l1_size *sizeof (uint64_t ); + l1_size2 = s->snapshots[i].l1_size *L1E_SIZE ; new_l1_table =g_try_realloc (l1_table, l1_size2);if (!new_l1_table) {
block/qcow2-refcount.c +46 -43
283 lines not on this page · raw message
block/qcow2-snapshot.c +10 -10
@@ -659,7 +659,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) sn->extra_data_size =sizeof (QCowSnapshotExtraData);/* Allocate the L1 table of the snapshot and copy the current one there. */ - l1_table_offset =qcow2_alloc_clusters (bs, s->l1_size *sizeof (uint64_t )); + l1_table_offset =qcow2_alloc_clusters (bs, s->l1_size *L1E_SIZE );if (l1_table_offset <0 ) { ret = l1_table_offset; goto fail;
@@ -679,13 +679,13 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) } ret =qcow2_pre_write_overlap_check (bs,0 , sn->l1_table_offset, - s->l1_size *sizeof (uint64_t ), false); + s->l1_size *L1E_SIZE , false);if (ret <0 ) { goto fail; } ret =bdrv_pwrite (bs->file, sn->l1_table_offset, l1_table, - s->l1_size *sizeof (uint64_t )); + s->l1_size *L1E_SIZE );if (ret <0 ) { goto fail; }
@@ -768,7 +768,7 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id) sn = &s->snapshots[snapshot_index]; ret =qcow2_validate_table (bs, sn->l1_table_offset, sn->l1_size, -sizeof (uint64_t ),QCOW_MAX_L1_SIZE , +L1E_SIZE ,QCOW_MAX_L1_SIZE ,"Snapshot L1 table" , &local_err);if (ret <0 ) {error_report_err (local_err);
@@ -803,8 +803,8 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id) goto fail; } - cur_l1_bytes = s->l1_size *sizeof (uint64_t ); - sn_l1_bytes = sn->l1_size *sizeof (uint64_t ); + cur_l1_bytes = s->l1_size *L1E_SIZE ; + sn_l1_bytes = sn->l1_size *L1E_SIZE ;/* * Copy the snapshot L1 table to the current L1 table.
@@ -917,7 +917,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, sn = s->snapshots[snapshot_index]; ret =qcow2_validate_table (bs, sn.l1_table_offset, sn.l1_size, -sizeof (uint64_t ),QCOW_MAX_L1_SIZE , +L1E_SIZE ,QCOW_MAX_L1_SIZE ,"Snapshot L1 table" , errp);if (ret <0 ) {return ret;
@@ -953,7 +953,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs,error_setg_errno (errp, -ret,"Failed to free the cluster and L1 table" );return ret; } -qcow2_free_clusters (bs, sn.l1_table_offset, sn.l1_size *sizeof (uint64_t ), +qcow2_free_clusters (bs, sn.l1_table_offset, sn.l1_size *L1E_SIZE ,QCOW2_DISCARD_SNAPSHOT );/* must update the copied flag on the current cluster offsets */
@@ -1030,12 +1030,12 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs,/* Allocate and read in the snapshot's L1 table */ ret =qcow2_validate_table (bs, sn->l1_table_offset, sn->l1_size, -sizeof (uint64_t ),QCOW_MAX_L1_SIZE , +L1E_SIZE ,QCOW_MAX_L1_SIZE ,"Snapshot L1 table" , errp);if (ret <0 ) {return ret; } - new_l1_bytes = sn->l1_size *sizeof (uint64_t ); + new_l1_bytes = sn->l1_size *L1E_SIZE ; new_l1_table =qemu_try_blockalign (bs->file->bs, new_l1_bytes);if (new_l1_table ==NULL ) {return -ENOMEM ;
block/qcow2.c +13 -14
@@ -1543,7 +1543,7 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,/* read the level 1 table */ ret =qcow2_validate_table (bs, header.l1_table_offset, - header.l1_size,sizeof (uint64_t ), + header.l1_size,L1E_SIZE ,QCOW_MAX_L1_SIZE ,"Active L1 table" , errp);if (ret <0 ) { goto fail;
@@ -1568,15 +1568,14 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, }if (s->l1_size >0 ) { - s->l1_table =qemu_try_blockalign (bs->file->bs, - s->l1_size *sizeof (uint64_t )); + s->l1_table =qemu_try_blockalign (bs->file->bs, s->l1_size *L1E_SIZE );if (s->l1_table ==NULL ) {error_setg (errp,"Could not allocate L1 table" ); ret = -ENOMEM ; goto fail; } ret =bdrv_pread (bs->file, s->l1_table_offset, s->l1_table, - s->l1_size *sizeof (uint64_t )); + s->l1_size *L1E_SIZE );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read L1 table" ); goto fail;
@@ -3213,7 +3212,7 @@ int64_t qcow2_refcount_metadata_size(int64_t clusters, size_t cluster_size,* where no further refcount blocks or table clusters are required to * reference count every cluster. */ -int64_t blocks_per_table_cluster = cluster_size /sizeof (uint64_t ); +int64_t blocks_per_table_cluster = cluster_size /REFTABLE_ENTRY_SIZE ;int64_t refcounts_per_block = cluster_size *8 / (1 << refcount_order);int64_t table =0 ;/* number of refcount table clusters */ int64_t blocks =0 ;/* number of refcount block clusters */
@@ -3270,8 +3269,8 @@ static int64_t qcow2_calc_prealloc_size(int64_t total_size,/* total size of L1 tables */ nl1e = nl2e * l2e_size / cluster_size; - nl1e =ROUND_UP (nl1e, cluster_size /sizeof (uint64_t )); - meta_size += nl1e *sizeof (uint64_t ); + nl1e =ROUND_UP (nl1e, cluster_size /L1E_SIZE ); + meta_size += nl1e *L1E_SIZE ;/* total size of refcount table and blocks */ meta_size += qcow2_refcount_metadata_size(
@@ -4460,7 +4459,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,/* write updated header.size */ offset =cpu_to_be64 (offset); ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , size), - &offset,sizeof (uint64_t )); + &offset,sizeof (offset));if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to update the image size" ); goto fail;
@@ -4700,8 +4699,8 @@ static int make_completely_empty(BlockDriverState *bs)BLKDBG_EVENT (bs->file,BLKDBG_L1_UPDATE ); - l1_clusters =DIV_ROUND_UP (s->l1_size, s->cluster_size /sizeof (uint64_t )); - l1_size2 = (uint64_t )s->l1_size *sizeof (uint64_t ); + l1_clusters =DIV_ROUND_UP (s->l1_size, s->cluster_size /L1E_SIZE ); + l1_size2 = (uint64_t )s->l1_size *L1E_SIZE ;/* After this call, neither the in-memory nor the on-disk refcount * information accurately describe the actual references */
@@ -4747,14 +4746,14 @@ static int make_completely_empty(BlockDriverState *bs) s->l1_table_offset =3 * s->cluster_size; - new_reftable =g_try_new0 (uint64_t, s->cluster_size /sizeof (uint64_t )); + new_reftable =g_try_new0 (uint64_t, s->cluster_size /REFTABLE_ENTRY_SIZE );if (!new_reftable) { ret = -ENOMEM ; goto fail_broken_refcounts; } s->refcount_table_offset = s->cluster_size; - s->refcount_table_size = s->cluster_size /sizeof (uint64_t ); + s->refcount_table_size = s->cluster_size /REFTABLE_ENTRY_SIZE ; s->max_refcount_table_index =0 ;g_free (s->refcount_table);
@@ -4826,7 +4825,7 @@ static int qcow2_make_empty(BlockDriverState *bs)int step =QEMU_ALIGN_DOWN (INT_MAX , s->cluster_size);int l1_clusters, ret =0 ; - l1_clusters =DIV_ROUND_UP (s->l1_size, s->cluster_size /sizeof (uint64_t )); + l1_clusters =DIV_ROUND_UP (s->l1_size, s->cluster_size /L1E_SIZE ); if (s->qcow_version >= 3 && !s->snapshots && !s->nb_bitmaps && 3 + l1_clusters <= s->refcount_block_size &&
@@ -4957,7 +4956,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs, l2e_size = extended_l2 ?L2E_SIZE_EXTENDED :L2E_SIZE_NORMAL ; l2_tables =DIV_ROUND_UP (virtual_size / cluster_size, cluster_size / l2e_size); -if (l2_tables *sizeof (uint64_t ) >QCOW_MAX_L1_SIZE ) { +if (l2_tables *L1E_SIZE >QCOW_MAX_L1_SIZE ) {error_setg (&local_err,"The image size is too large " "(try using a larger cluster size)" ); goto err;
Signature · 1 line
2.20.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Max Reitz
AppliedQuoted 4 lines · Alberto Garcia
This patch replaces instances of
sizeof(uint64_t)in the qcow2 driver with macros that indicate what those sizes are actually referring to.Signed-off-by Alberto Garcia <[email protected]>
Quoted 8 lines
--- block/qcow2.h | 6 +++ block/qcow2-bitmap.c | 11 ++++-- block/qcow2-cluster.c | 24 ++++++------ block/qcow2-refcount.c | 89 ++++++++++++++++++++++-------------------- block/qcow2-snapshot.c | 20 +++++----- block/qcow2.c | 27 ++++++------- 6 files changed, 94 insertions(+), 83 deletions(-)
Thanks, applied to my block branch: