From nobody Tue Nov 11 22:49:07 2025 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=1566241268; cv=none; d=zoho.com; s=zohoarc; b=ixIGqkhgMB4kOIIm521q9QviYu/dGEg0aRpqxeWeSonQbjOuAEd4cAO9DVftpthBo73qkCuyL+oj7+ze2tdljDibyWty0DJZ4zVqFPuIDgxSwcdG1vjldbq60FIoxJVV+FuzAIebSXVBlUWwZiK1PVFWhnt9a5RjGnG0p24bG2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566241268; 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:ARC-Authentication-Results; bh=KXxIxOF4CL5Hk/T+lHGRx+9o+LOYctxam9wQZ3Wrd3o=; b=EbRtJm6gucT4c4R7EeITi8i0aruj6hYcxyrJPU1lyz91Cstw9KRRjgsM73lFoxOK7OuSyv10FQVT+GJmlB65GVsCnNjZ6lcC/THs8WMowij+XazxoPrCSxGnCTnJdwHUPVEWZsrM4qvkioBZfCERY7Bi4zlDtsa+yjWWCzRYNVY= 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 1566241268633218.70403772738382; Mon, 19 Aug 2019 12:01:08 -0700 (PDT) Received: from localhost ([::1]:56616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzmts-0007mG-Pj for importer@patchew.org; Mon, 19 Aug 2019 15:01:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60920) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzmpQ-0001vk-D5 for qemu-devel@nongnu.org; Mon, 19 Aug 2019 14:56:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzmpP-000234-0g for qemu-devel@nongnu.org; Mon, 19 Aug 2019 14:56:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37108) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hzmpM-00020o-3S; Mon, 19 Aug 2019 14:56:24 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 64BB083F3E; Mon, 19 Aug 2019 18:56:23 +0000 (UTC) Received: from localhost (ovpn-204-64.brq.redhat.com [10.40.204.64]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA1F81E3; Mon, 19 Aug 2019 18:56:22 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 19 Aug 2019 20:55:53 +0200 Message-Id: <20190819185602.4267-8-mreitz@redhat.com> In-Reply-To: <20190819185602.4267-1-mreitz@redhat.com> References: <20190819185602.4267-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 19 Aug 2019 18:56:23 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 07/16] qcow2: Write v3-compliant snapshot list on upgrade 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" qcow2 v3 requires every snapshot table entry to have two extra data fields: The 64-bit VM state size, and the virtual disk size. Both are optional for v2 images, so they may not be present. qcow2_upgrade() therefore should update the snapshot table to ensure all entries have these extra data fields. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1727347 Reported-by: Eric Blake Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 190a3874c1..2219639e11 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4759,7 +4759,9 @@ static int qcow2_upgrade(BlockDriverState *bs, int ta= rget_version, Error **errp) { BDRVQcow2State *s =3D bs->opaque; + bool need_snapshot_update; int current_version =3D s->qcow_version; + int i; int ret; =20 /* This is qcow2_upgrade(), not qcow2_downgrade() */ @@ -4768,7 +4770,33 @@ static int qcow2_upgrade(BlockDriverState *bs, int t= arget_version, /* There are no other versions (yet) that you can upgrade to */ assert(target_version =3D=3D 3); =20 - status_cb(bs, 0, 1, cb_opaque); + status_cb(bs, 0, 2, cb_opaque); + + /* + * In v2, snapshots do not need to have extra data. v3 requires + * the 64-bit VM state size and the virtual disk size to be + * present. + * qcow2_write_snapshots() will always write the list in the + * v3-compliant format. + */ + need_snapshot_update =3D false; + for (i =3D 0; i < s->nb_snapshots; i++) { + if (s->snapshots[i].extra_data_size < + sizeof_field(QCowSnapshotExtraData, vm_state_size_large) + + sizeof_field(QCowSnapshotExtraData, disk_size)) + { + need_snapshot_update =3D true; + break; + } + } + if (need_snapshot_update) { + ret =3D qcow2_write_snapshots(bs); + if (ret < 0) { + error_setg_errno(errp, -ret, "Failed to update the snapshot ta= ble"); + return ret; + } + } + status_cb(bs, 1, 2, cb_opaque); =20 s->qcow_version =3D target_version; ret =3D qcow2_update_header(bs); @@ -4777,7 +4805,7 @@ static int qcow2_upgrade(BlockDriverState *bs, int ta= rget_version, error_setg_errno(errp, -ret, "Failed to update the image header"); return ret; } - status_cb(bs, 1, 1, cb_opaque); + status_cb(bs, 2, 2, cb_opaque); =20 return 0; } --=20 2.21.0