From nobody Mon Feb 9 19:37:39 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; dkim=fail; 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=1572267332; cv=none; d=zoho.com; s=zohoarc; b=nwXOB4AMXm3AF+O+JTL43zTAee9cc6FB1EcwxdZN+Pd2fJVe5KEQig1sp+ZjdvkAyBVd7/iv+XgqafW1rNOj+xOffel1IYpr1gzBmL2nOB05RrgWuDL6ls+RXCUDIgVgTwTPb+RshJ8eHervvJR0iSYOvYLtAbCaVH56pp8AG8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572267332; h=Content-Type: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=S2ttQR79Z06v2c1QVZU1sPgiAUsv2sQpamGH9nr+sA4=; b=J7kA11fHiolg/dF9c4UsM4nUUlqHyxcgFj0GwnBdgKMn5YVQPIlTvsPgIz/P+dplhmcylhm/7ibCmrUXPpJa2oOa5Hzd74GL6LYvCLkvYuaFvv6rt7WUn62svEAeqbyC/DgJhw5zE8bdnMW0Av0cTb4ijx6bA99y30w2Rmbg1UQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 1572267332628520.5677779055583; Mon, 28 Oct 2019 05:55:32 -0700 (PDT) Received: from localhost ([::1]:53438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iP4YR-00008C-1Q for importer@patchew.org; Mon, 28 Oct 2019 08:55:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50942) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iP3xH-0003I9-SC for qemu-devel@nongnu.org; Mon, 28 Oct 2019 08:17:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iP3xB-00028T-Qb for qemu-devel@nongnu.org; Mon, 28 Oct 2019 08:17:00 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29570 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iP3xB-00025q-Jd for qemu-devel@nongnu.org; Mon, 28 Oct 2019 08:16:57 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-M675tbriNnOgl9qXxLQR-g-1; Mon, 28 Oct 2019 08:16:49 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0F94180496E; Mon, 28 Oct 2019 12:16:48 +0000 (UTC) Received: from localhost (ovpn-117-83.ams2.redhat.com [10.36.117.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85ADC4D; Mon, 28 Oct 2019 12:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572265013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S2ttQR79Z06v2c1QVZU1sPgiAUsv2sQpamGH9nr+sA4=; b=evb5n8qIPKMx1exji3Ag+u5LSIMikn6ZEDbPwtOtGkldkBF9GP6FvkPdLETyjdYzBks00X 0QkmCJigVa12vr6pIfgXrJ5OxD8hxTiEnr6RxKD65hduB4RtcWRDRxxa3t8iuc5rmDSiTN yHFMAya71ugbT7CaEw9AW0Ov+q3w9Lw= From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 51/69] qcow2: Write v3-compliant snapshot list on upgrade Date: Mon, 28 Oct 2019 13:14:43 +0100 Message-Id: <20191028121501.15279-52-mreitz@redhat.com> In-Reply-To: <20191028121501.15279-1-mreitz@redhat.com> References: <20191028121501.15279-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: M675tbriNnOgl9qXxLQR-g-1 X-Mimecast-Spam-Score: 0 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: 205.139.110.61 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 , Peter Maydell , qemu-devel@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) 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 Message-id: 20191011152814.14791-8-mreitz@redhat.com Signed-off-by: Max Reitz --- block/qcow2.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index af08757055..e3a4c44fb7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4922,7 +4922,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() */ @@ -4931,7 +4933,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); @@ -4940,7 +4968,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