From nobody Mon Feb 9 09:52:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570807862; cv=none; d=zoho.com; s=zohoarc; b=QZNNe797TTFzlLlUeR63gfno9E5WebEfLXIpXsj7jDuxxyLHpy6qV7JJmVuT4er3MIIooVmsqfZRTgnNNGs4GSJPBPvg/YkBol4Xr9I+xRljPA56u6O/QmWuku66KW9QZojMKN6aq6Ga6DxyN8gLcwTt1qA7zbs2LrpOTSqei+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570807862; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rdpfZ+Y38TQhd4xmQMeFvA12Qaer2DufYyVhRcXYCq0=; b=CuEfH91T+rDvBZ2hOam/l2rgSvsDG92U396HCwWGZXJgP7PULdobbPaFVGOxVGkJS1XL4ek0qse6JutQVYVdo90XMVo8JHfrrIf7ZpfDTuL4VQWshtfUpWCMTmkpztCrmzpHWhK6JNibz7O3O8As6HXPm8Qu2JoJV8iqAbFEXwE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570807862365334.2083522260556; Fri, 11 Oct 2019 08:31:02 -0700 (PDT) Received: from localhost ([::1]:52210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwsc-0003MT-T7 for importer@patchew.org; Fri, 11 Oct 2019 11:30:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57672) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwqB-0001GI-IQ for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:28:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIwqA-0006Pv-IM for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:28:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53134) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIwq8-0006Mx-FQ; Fri, 11 Oct 2019 11:28:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B4D3B3090FDD; Fri, 11 Oct 2019 15:28:23 +0000 (UTC) Received: from localhost (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2BDD3600C4; Fri, 11 Oct 2019 15:28:22 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 02/16] qcow2: Use endof() Date: Fri, 11 Oct 2019 17:28:00 +0200 Message-Id: <20191011152814.14791-3-mreitz@redhat.com> In-Reply-To: <20191011152814.14791-1-mreitz@redhat.com> References: <20191011152814.14791-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 11 Oct 2019 15:28:23 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2-snapshot.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index d0e7fa9311..752883e5c3 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -92,11 +92,12 @@ int qcow2_read_snapshots(BlockDriverState *bs) } offset +=3D extra_data_size; =20 - if (extra_data_size >=3D 8) { + if (extra_data_size >=3D endof(QCowSnapshotExtraData, + vm_state_size_large)) { sn->vm_state_size =3D be64_to_cpu(extra.vm_state_size_large); } =20 - if (extra_data_size >=3D 16) { + if (extra_data_size >=3D endof(QCowSnapshotExtraData, disk_size)) { sn->disk_size =3D be64_to_cpu(extra.disk_size); } else { sn->disk_size =3D bs->total_sectors * BDRV_SECTOR_SIZE; @@ -251,7 +252,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs) } =20 QEMU_BUILD_BUG_ON(offsetof(QCowHeader, snapshots_offset) !=3D - offsetof(QCowHeader, nb_snapshots) + sizeof(header_data.nb_snapsho= ts)); + endof(QCowHeader, nb_snapshots)); =20 header_data.nb_snapshots =3D cpu_to_be32(s->nb_snapshots); header_data.snapshots_offset =3D cpu_to_be64(snapshots_offset); --=20 2.21.0