From nobody Mon Feb 9 12:42:36 2026 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.zoho.com; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493867574991755.392766553087; Wed, 3 May 2017 20:12:54 -0700 (PDT) Received: from localhost ([::1]:39526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d67CH-0006wm-II for importer@patchew.org; Wed, 03 May 2017 23:12:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d677g-0002tr-Nz for qemu-devel@nongnu.org; Wed, 03 May 2017 23:08:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d677f-0001FN-1W for qemu-devel@nongnu.org; Wed, 03 May 2017 23:08:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d677b-0001DU-8a; Wed, 03 May 2017 23:08:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FF27C04BD2E; Thu, 4 May 2017 03:08:02 +0000 (UTC) Received: from red.redhat.com (ovpn-122-206.rdu2.redhat.com [10.10.122.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90AC762923; Thu, 4 May 2017 03:08:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5FF27C04BD2E Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5FF27C04BD2E From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 3 May 2017 22:07:46 -0500 Message-Id: <20170504030755.1001-2-eblake@redhat.com> In-Reply-To: <20170504030755.1001-1-eblake@redhat.com> References: <20170504030755.1001-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 04 May 2017 03:08:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v12 01/10] qcow2: Use consistent switch indentation 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: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix a couple of inconsistent indentations, before an upcoming patch further tweaks the switch statements. While at it, make some tweaks for shorter lines to keep checkpatch happy (best viewed with 'git diff -b'). Signed-off-by: Eric Blake Reviewed-by: Max Reitz --- v12: new patch --- block/qcow2-cluster.c | 32 ++++++++--------- block/qcow2-refcount.c | 96 ++++++++++++++++++++++++++--------------------= ---- 2 files changed, 65 insertions(+), 63 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 31077d8..335a505 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1504,25 +1504,25 @@ static int discard_single_l2(BlockDriverState *bs, = uint64_t offset, * but rather fall through to the backing file. */ switch (qcow2_get_cluster_type(old_l2_entry)) { - case QCOW2_CLUSTER_UNALLOCATED: - if (full_discard || !bs->backing) { - continue; - } - break; + case QCOW2_CLUSTER_UNALLOCATED: + if (full_discard || !bs->backing) { + continue; + } + break; - case QCOW2_CLUSTER_ZERO: - /* Preallocated zero clusters should be discarded in any c= ase */ - if (!full_discard && (old_l2_entry & L2E_OFFSET_MASK) =3D= =3D 0) { - continue; - } - break; + case QCOW2_CLUSTER_ZERO: + /* Preallocated zero clusters should be discarded in any case = */ + if (!full_discard && (old_l2_entry & L2E_OFFSET_MASK) =3D=3D 0= ) { + continue; + } + break; - case QCOW2_CLUSTER_NORMAL: - case QCOW2_CLUSTER_COMPRESSED: - break; + case QCOW2_CLUSTER_NORMAL: + case QCOW2_CLUSTER_COMPRESSED: + break; - default: - abort(); + default: + abort(); } /* First remove L2 entries */ diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 4efca7e..a5a0076 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1117,70 +1117,72 @@ int qcow2_update_snapshot_refcount(BlockDriverState= *bs, goto fail; } - for(j =3D 0; j < s->l2_size; j++) { + for (j =3D 0; j < s->l2_size; j++) { uint64_t cluster_index; + uint64_t offset_masked; offset =3D be64_to_cpu(l2_table[j]); old_offset =3D offset; + offset_masked =3D offset & L2E_OFFSET_MASK; offset &=3D ~QCOW_OFLAG_COPIED; switch (qcow2_get_cluster_type(offset)) { - case QCOW2_CLUSTER_COMPRESSED: - nb_csectors =3D ((offset >> s->csize_shift) & - s->csize_mask) + 1; - if (addend !=3D 0) { - ret =3D update_refcount(bs, - (offset & s->cluster_offset_mask) & ~511, - nb_csectors * 512, abs(addend), addend < 0, - QCOW2_DISCARD_SNAPSHOT); - if (ret < 0) { - goto fail; - } - } - /* compressed clusters are never modified */ - refcount =3D 2; - break; - - case QCOW2_CLUSTER_NORMAL: - case QCOW2_CLUSTER_ZERO: - if (offset_into_cluster(s, offset & L2E_OFFSET_MAS= K)) { - qcow2_signal_corruption(bs, true, -1, -1, "Dat= a " - "cluster offset %#llx " - "unaligned (L2 offset:= %#" - PRIx64 ", L2 index: %#= x)", - offset & L2E_OFFSET_MA= SK, - l2_offset, j); - ret =3D -EIO; + case QCOW2_CLUSTER_COMPRESSED: + nb_csectors =3D ((offset >> s->csize_shift) & + s->csize_mask) + 1; + if (addend !=3D 0) { + ret =3D update_refcount(bs, + (offset & s->cluster_offset_mask) & ~511, + nb_csectors * 512, abs(addend), addend < 0, + QCOW2_DISCARD_SNAPSHOT); + if (ret < 0) { goto fail; } + } + /* compressed clusters are never modified */ + refcount =3D 2; + break; - cluster_index =3D (offset & L2E_OFFSET_MASK) >> s-= >cluster_bits; - if (!cluster_index) { - /* unallocated */ - refcount =3D 0; - break; - } - if (addend !=3D 0) { - ret =3D qcow2_update_cluster_refcount(bs, + case QCOW2_CLUSTER_NORMAL: + case QCOW2_CLUSTER_ZERO: + if (offset_into_cluster(s, offset_masked)) { + qcow2_signal_corruption(bs, true, -1, -1, "Data " + "cluster offset %#" PRIx64 + " unaligned (L2 offset: %#" + PRIx64 ", L2 index: %#x)", + offset_masked, + l2_offset, j); + ret =3D -EIO; + goto fail; + } + + cluster_index =3D offset_masked >> s->cluster_bits; + if (!cluster_index) { + /* unallocated */ + refcount =3D 0; + break; + } + if (addend !=3D 0) { + ret =3D qcow2_update_cluster_refcount(bs, cluster_index, abs(addend), addend < 0, QCOW2_DISCARD_SNAPSHOT); - if (ret < 0) { - goto fail; - } - } - - ret =3D qcow2_get_refcount(bs, cluster_index, &ref= count); if (ret < 0) { goto fail; } - break; + } - case QCOW2_CLUSTER_UNALLOCATED: - refcount =3D 0; - break; + ret =3D qcow2_get_refcount(bs, cluster_index, &refcoun= t); + if (ret < 0) { + goto fail; + } + break; - default: - abort(); + case QCOW2_CLUSTER_UNALLOCATED: + refcount =3D 0; + break; + + default: + abort(); } if (refcount =3D=3D 1) { --=20 2.9.3