From nobody Fri Dec 19 04:18:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1687878844; cv=none; d=zohomail.com; s=zohoarc; b=CwfhjoWh6NIHY2fF/cIaBR1HBMvXv7U1AEXRnu/9QOdChlI+UyV+z8PAf07mSHA90JH5cw2uBsXIveWSE/orh8Z4PTd6Ei79PcnnpJ8CEwpHGX2owfJbzsTB2AzglT2i9Q4g3KesrSHBf7Iq2z/Ms4tjo929gsKLEa6ghfT0gNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687878844; h=Content-Type:Content-Transfer-Encoding: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=b9Ga8OWEhj7aXgC4Hm7MPzz25IQbjb6GJ99jMZ7FKUQ=; b=eCqOgMQDeqh4EWdR/rMvKFIJSsqw8Xjxzs3ZzHurXHf2KsIT+hpwmCZwrHUwbyombbyB4psqx8d3udBlOijQdy/XIxLQnVVbFiamHKemRXlBHH0bami6F3A3XuyA9n3+UKjK7LsC3xA86chmL3BoGHXP+fDdkHLGh8s81OtxzKs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1687878844407471.8079982930162; Tue, 27 Jun 2023 08:14:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-302-nNMbfHmzNdyMTIwd-BzWUA-1; Tue, 27 Jun 2023 11:13:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DA1A2108BDCD; Tue, 27 Jun 2023 15:07:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C63E3C478C8; Tue, 27 Jun 2023 15:07:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 41B6019451FC; Tue, 27 Jun 2023 15:07:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DE8F21946588 for ; Tue, 27 Jun 2023 15:07:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CF1CA400E88; Tue, 27 Jun 2023 15:07:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.45.225.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73D9448FB01 for ; Tue, 27 Jun 2023 15:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687878843; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=b9Ga8OWEhj7aXgC4Hm7MPzz25IQbjb6GJ99jMZ7FKUQ=; b=K7mquY7CMlqVaFMoWeYMptwj2L/tmXkv4tlk0YvAe5eHkmQNwq785dCoEZKGHwbZMgThIv MOKrcFqJb39SqNs2oTfd+7BTi3Il5Ccs2x7whVP3SQmbL+qTWWUi1XLA0zq63CrXHCfIZQ JMufa3zQcqSotnLu8jcOUf6o9rehy+s= X-MC-Unique: nNMbfHmzNdyMTIwd-BzWUA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 10/24] qemu_snapshot: move external disk prepare to single function Date: Tue, 27 Jun 2023 17:07:13 +0200 Message-ID: <5dd584843c3fdff751d1f248d3f61b723786eeeb.1687877087.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687878845901100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We will need to reuse the functionality when reverting external snapshots. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 069c4c8ba7..5d2ffdeee6 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -520,6 +520,25 @@ qemuSnapshotPrepareDiskExternal(virDomainDiskDef *disk, bool active, bool reuse) { + if (!snapdisk->src->format) { + snapdisk->src->format =3D VIR_STORAGE_FILE_QCOW2; + } else if (snapdisk->src->format !=3D VIR_STORAGE_FILE_QCOW2 && + snapdisk->src->format !=3D VIR_STORAGE_FILE_QED) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("external snapshot format for disk %1$s is unsupp= orted: %2$s"), + snapdisk->name, + virStorageFileFormatTypeToString(snapdisk->src->for= mat)); + return -1; + } + + if (snapdisk->src->metadataCacheMaxSize > 0) { + if (snapdisk->src->format !=3D VIR_STORAGE_FILE_QCOW2) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("metadata cache max size control is supported= only with qcow2 images")); + return -1; + } + } + if (qemuTranslateSnapshotDiskSourcePool(snapdisk) < 0) return -1; =20 @@ -700,25 +719,6 @@ qemuSnapshotPrepare(virDomainObj *vm, break; =20 case VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL: - if (!disk->src->format) { - disk->src->format =3D VIR_STORAGE_FILE_QCOW2; - } else if (disk->src->format !=3D VIR_STORAGE_FILE_QCOW2 && - disk->src->format !=3D VIR_STORAGE_FILE_QED) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external snapshot format for disk %1$s i= s unsupported: %2$s"), - disk->name, - virStorageFileFormatTypeToString(disk->src-= >format)); - return -1; - } - - if (disk->src->metadataCacheMaxSize > 0) { - if (disk->src->format !=3D VIR_STORAGE_FILE_QCOW2) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("metadata cache max size control is s= upported only with qcow2 images")); - return -1; - } - } - if (qemuSnapshotPrepareDiskExternal(dom_disk, disk, active, re= use) < 0) return -1; =20 --=20 2.41.0