From nobody Fri May 10 20:46:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518700313986786.3300766344222; Thu, 15 Feb 2018 05:11:53 -0800 (PST) Received: from localhost ([::1]:47410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emJKD-00044y-4y for importer@patchew.org; Thu, 15 Feb 2018 08:11:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emJJ9-0003eb-0n for qemu-devel@nongnu.org; Thu, 15 Feb 2018 08:10:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emJJ4-0003ri-DS for qemu-devel@nongnu.org; Thu, 15 Feb 2018 08:10:38 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:35096) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emJJ3-0003rO-Rs; Thu, 15 Feb 2018 08:10:34 -0500 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1emJJ1-0000Fa-42; Thu, 15 Feb 2018 14:10:31 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1emJIi-0001Ln-Fj; Thu, 15 Feb 2018 15:10:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject:Cc:To:From; bh=ifxIjLlA/CpaqPc33aQoG1Qes8xK9xJeBPDdjzdyfks=; b=oKlTet9xfnaVYF1WdNnQiyuIRP8Dqp0bP3OlX0clNavWOMSCuJFZ9JNvMCwBJ4hSgFTVumGhhRg+9A7qH662xI6rZJ3xcH/imoclBG90sAjBDRj8tkif4saG0nHjauhUvegOnghcNppYCeSF0YEQOON4liRj3v/bnpBc40qt0LkJ+Br8G5UdleT0KE/uIIoXj0mOsY468viS4Hki9vq3rQDWpTudPZ8Dy1b+p0sv0Ma5I9pM1ysrwgj2QSH8NkJ8iXDBCE5f9kY6bZUcsMUpkqqPYzHkf2B0f/MBC5Ej6RuKdJLLm2rGSNN7SQjSuRyJ5Ndw6zYG54RQDXPVFHBnOw==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 15:10:08 +0200 Message-Id: <20180215131008.5153-1-berto@igalia.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v3] qcow2: Replace align_offset() with ROUND_UP() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The align_offset() function is equivalent to the ROUND_UP() macro so there's no need to use the former. The ROUND_UP() name is also a bit more explicit. This patch uses ROUND_UP() instead of the slower QEMU_ALIGN_UP() because align_offset() already requires that the second parameter is a power of two. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v3 is the same as v2, but rebased on top of the current master fixing a merge conflict. --- block/qcow2-bitmap.c | 4 ++-- block/qcow2-cluster.c | 4 ++-- block/qcow2-refcount.c | 4 ++-- block/qcow2-snapshot.c | 10 +++++----- block/qcow2.c | 14 +++++++------- block/qcow2.h | 6 ------ 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 4f6fd863ea..5127276f90 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -413,8 +413,8 @@ static inline void bitmap_dir_entry_to_be(Qcow2BitmapDi= rEntry *entry) =20 static inline int calc_dir_entry_size(size_t name_size, size_t extra_data_= size) { - return align_offset(sizeof(Qcow2BitmapDirEntry) + - name_size + extra_data_size, 8); + int size =3D sizeof(Qcow2BitmapDirEntry) + name_size + extra_data_size; + return ROUND_UP(size, 8); } =20 static inline int dir_entry_size(Qcow2BitmapDirEntry *entry) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index e406b0f3b9..98908c4264 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -126,11 +126,11 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_= t min_size, =20 new_l1_size2 =3D sizeof(uint64_t) * new_l1_size; new_l1_table =3D qemu_try_blockalign(bs->file->bs, - align_offset(new_l1_size2, 512)); + ROUND_UP(new_l1_size2, 512)); if (new_l1_table =3D=3D NULL) { return -ENOMEM; } - memset(new_l1_table, 0, align_offset(new_l1_size2, 512)); + memset(new_l1_table, 0, ROUND_UP(new_l1_size2, 512)); =20 if (s->l1_size) { memcpy(new_l1_table, s->l1_table, s->l1_size * sizeof(uint64_t)); diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index d46b69d7f3..126cca3276 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1204,7 +1204,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *= bs, * l1_table_offset when it is the current s->l1_table_offset! Be caref= ul * when changing this! */ if (l1_table_offset !=3D s->l1_table_offset) { - l1_table =3D g_try_malloc0(align_offset(l1_size2, 512)); + l1_table =3D g_try_malloc0(ROUND_UP(l1_size2, 512)); if (l1_size2 && l1_table =3D=3D NULL) { ret =3D -ENOMEM; goto fail; @@ -2553,7 +2553,7 @@ int qcow2_check_metadata_overlap(BlockDriverState *bs= , int ign, int64_t offset, } =20 /* align range to test to cluster boundaries */ - size =3D align_offset(offset_into_cluster(s, offset) + size, s->cluste= r_size); + size =3D ROUND_UP(offset_into_cluster(s, offset) + size, s->cluster_si= ze); offset =3D start_of_cluster(s, offset); =20 if ((chk & QCOW2_OL_ACTIVE_L1) && s->l1_size) { diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 44243e0e95..cee25f582b 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -66,7 +66,7 @@ int qcow2_read_snapshots(BlockDriverState *bs) =20 for(i =3D 0; i < s->nb_snapshots; i++) { /* Read statically sized part of the snapshot header */ - offset =3D align_offset(offset, 8); + offset =3D ROUND_UP(offset, 8); ret =3D bdrv_pread(bs->file, offset, &h, sizeof(h)); if (ret < 0) { goto fail; @@ -155,7 +155,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs) offset =3D 0; for(i =3D 0; i < s->nb_snapshots; i++) { sn =3D s->snapshots + i; - offset =3D align_offset(offset, 8); + offset =3D ROUND_UP(offset, 8); offset +=3D sizeof(h); offset +=3D sizeof(extra); offset +=3D strlen(sn->id_str); @@ -215,7 +215,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs) assert(id_str_size <=3D UINT16_MAX && name_size <=3D UINT16_MAX); h.id_str_size =3D cpu_to_be16(id_str_size); h.name_size =3D cpu_to_be16(name_size); - offset =3D align_offset(offset, 8); + offset =3D ROUND_UP(offset, 8); =20 ret =3D bdrv_pwrite(bs->file, offset, &h, sizeof(h)); if (ret < 0) { @@ -441,7 +441,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSna= pshotInfo *sn_info) /* The VM state isn't needed any more in the active L1 table; in fact,= it * hurts by causing expensive COW for the next snapshot. */ qcow2_cluster_discard(bs, qcow2_vm_state_offset(s), - align_offset(sn->vm_state_size, s->cluster_size), + ROUND_UP(sn->vm_state_size, s->cluster_size), QCOW2_DISCARD_NEVER, false); =20 #ifdef DEBUG_ALLOC @@ -710,7 +710,7 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs, } new_l1_bytes =3D sn->l1_size * sizeof(uint64_t); new_l1_table =3D qemu_try_blockalign(bs->file->bs, - align_offset(new_l1_bytes, 512)); + ROUND_UP(new_l1_bytes, 512)); if (new_l1_table =3D=3D NULL) { return -ENOMEM; } diff --git a/block/qcow2.c b/block/qcow2.c index 57a517e2bd..2c6c33b67c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1379,7 +1379,7 @@ static int qcow2_do_open(BlockDriverState *bs, QDict = *options, int flags, =20 if (s->l1_size > 0) { s->l1_table =3D qemu_try_blockalign(bs->file->bs, - align_offset(s->l1_size * sizeof(uint64_t), 512)); + ROUND_UP(s->l1_size * sizeof(uint64_t), 512)); if (s->l1_table =3D=3D NULL) { error_setg(errp, "Could not allocate L1 table"); ret =3D -ENOMEM; @@ -2640,19 +2640,19 @@ static int64_t qcow2_calc_prealloc_size(int64_t tot= al_size, { int64_t meta_size =3D 0; uint64_t nl1e, nl2e; - int64_t aligned_total_size =3D align_offset(total_size, cluster_size); + int64_t aligned_total_size =3D ROUND_UP(total_size, cluster_size); =20 /* header: 1 cluster */ meta_size +=3D cluster_size; =20 /* total size of L2 tables */ nl2e =3D aligned_total_size / cluster_size; - nl2e =3D align_offset(nl2e, cluster_size / sizeof(uint64_t)); + nl2e =3D ROUND_UP(nl2e, cluster_size / sizeof(uint64_t)); meta_size +=3D nl2e * sizeof(uint64_t); =20 /* total size of L1 tables */ nl1e =3D nl2e * sizeof(uint64_t) / cluster_size; - nl1e =3D align_offset(nl1e, cluster_size / sizeof(uint64_t)); + nl1e =3D ROUND_UP(nl1e, cluster_size / sizeof(uint64_t)); meta_size +=3D nl1e * sizeof(uint64_t); =20 /* total size of refcount table and blocks */ @@ -3706,8 +3706,8 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, has_backing_file =3D !!optstr; g_free(optstr); =20 - virtual_size =3D align_offset(qemu_opt_get_size_del(opts, BLOCK_OPT_SI= ZE, 0), - cluster_size); + virtual_size =3D qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0); + virtual_size =3D ROUND_UP(virtual_size, cluster_size); =20 /* Check that virtual disk size is valid */ l2_tables =3D DIV_ROUND_UP(virtual_size / cluster_size, @@ -3727,7 +3727,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, goto err; } =20 - virtual_size =3D align_offset(ssize, cluster_size); + virtual_size =3D ROUND_UP(ssize, cluster_size); =20 if (has_backing_file) { /* We don't how much of the backing chain is shared by the inp= ut diff --git a/block/qcow2.h b/block/qcow2.h index 883802241f..1a84cc77b0 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -480,12 +480,6 @@ static inline int offset_to_l2_slice_index(BDRVQcow2St= ate *s, int64_t offset) return (offset >> s->cluster_bits) & (s->l2_slice_size - 1); } =20 -static inline int64_t align_offset(int64_t offset, int n) -{ - offset =3D (offset + n - 1) & ~(n - 1); - return offset; -} - static inline int64_t qcow2_vm_state_offset(BDRVQcow2State *s) { return (int64_t)s->l1_vm_state_index << (s->cluster_bits + s->l2_bits); --=20 2.11.0