From nobody Mon Feb 9 08:31:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1621601277; cv=none; d=zohomail.com; s=zohoarc; b=J4Nr1p6GNdSLYBnc7ZfLyTRLDa8cG5mFMNUYUJo8sgYKAzW4v9pN9w9iZzN5NgcmP8cUj5nRFAn9WSJX/heSBLZHvVl+U887KutoG1n1hB/T8vPN8Ipaxd48aFSNfyMFRvUSa/+7q8hI121MSWGf9ih0lP6zsSeH7aNf+3KzdYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621601277; 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=16pscrs5fkf42qV0o8i238IA69d04LMNd+wfL11Fe7w=; b=VRNP7S6frX5enFUmC6Xvh6LaOATF0PJKxzQVj17/pLowsUGCtG+miL1b1HRL39nb3J9/PX74fNWsk39hPePHpdJ1H3WID/6zFOxqnIGQEOgkGVMC1L9eYPxZ2/Um17gsZcpEOicxUxT5kG9UgD6rWE4uW/P6d68Z0C/zEMKgm9c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621601277144460.86197968609304; Fri, 21 May 2021 05:47:57 -0700 (PDT) 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-411-s_r3IRvtMcO_bX6UcDQxXg-1; Fri, 21 May 2021 08:47:53 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21EE18A9F4E; Fri, 21 May 2021 12:47:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE1FB5C730; Fri, 21 May 2021 12:47:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 95F761800BB4; Fri, 21 May 2021 12:47:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14LClgRL030910 for ; Fri, 21 May 2021 08:47:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 819B669FB1; Fri, 21 May 2021 12:47:42 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE11669FCE for ; Fri, 21 May 2021 12:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621601275; 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=16pscrs5fkf42qV0o8i238IA69d04LMNd+wfL11Fe7w=; b=chIG7LKCLDJM5KAEPRViHlu1WZZmZ7aeUephY5Egz8kQpQqrLCd2FwtMCqHQPM9Riv4/2l WwggxEwbF8XmYlrmXQHdg8JXt6oSJnDS7rsVCbDYcszpkhtTUYE1zvm+qfppF+vSky19ZD OdpEBS2r6u8KC87zCnlYmTxaYd/f2I4= X-MC-Unique: s_r3IRvtMcO_bX6UcDQxXg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/35] qemu: snapshot: Extract setup of snapshot disk definition for transient disks Date: Fri, 21 May 2021 14:47:01 +0200 Message-Id: <8779d99daffd2083913d538e378f5787761fd864.1621601160.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The code will be later reused when adding support for sharing the backing image of the snapshot. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_snapshot.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index fd6669433b..c3cff46bc9 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1168,6 +1168,29 @@ qemuSnapshotDiskPrepareActiveExternal(virDomainObj *= vm, } +static virDomainSnapshotDiskDef * +qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk) +{ + g_autoptr(virDomainSnapshotDiskDef) snapdisk =3D g_new0(virDomainSnaps= hotDiskDef, 1); + + snapdisk->name =3D g_strdup(domdisk->dst); + snapdisk->snapshot =3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; + snapdisk->src =3D virStorageSourceNew(); + snapdisk->src->type =3D VIR_STORAGE_TYPE_FILE; + snapdisk->src->format =3D VIR_STORAGE_FILE_QCOW2; + snapdisk->src->path =3D g_strdup_printf("%s.TRANSIENT", domdisk->src->= path); + + if (virFileExists(snapdisk->src->path)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Overlay file '%s' for transient disk '%s' alread= y exists"), + snapdisk->src->path, domdisk->dst); + return NULL; + } + + return g_steal_pointer(&snapdisk); +} + + static qemuSnapshotDiskContext * qemuSnapshotDiskPrepareDisksTransient(virDomainObj *vm, virQEMUDriverConfig *cfg, @@ -1181,26 +1204,15 @@ qemuSnapshotDiskPrepareDisksTransient(virDomainObj = *vm, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDef *domdisk =3D vm->def->disks[i]; - g_autoptr(virDomainSnapshotDiskDef) snapdisk =3D g_new0(virDomainS= napshotDiskDef, 1); + g_autoptr(virDomainSnapshotDiskDef) snapdisk =3D NULL; if (!domdisk->transient) continue; /* validation code makes sure that we do this only for local disks * with a file source */ - snapdisk->name =3D g_strdup(domdisk->dst); - snapdisk->snapshot =3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; - snapdisk->src =3D virStorageSourceNew(); - snapdisk->src->type =3D VIR_STORAGE_TYPE_FILE; - snapdisk->src->format =3D VIR_STORAGE_FILE_QCOW2; - snapdisk->src->path =3D g_strdup_printf("%s.TRANSIENT", domdisk->s= rc->path); - - if (virFileExists(snapdisk->src->path)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Overlay file '%s' for transient disk '%s' al= ready exists"), - snapdisk->src->path, domdisk->dst); - return NULL; - } + + snapdisk =3D qemuSnapshotGetTransientDiskDef(domdisk); if (qemuSnapshotDiskPrepareOne(vm, cfg, domdisk, snapdisk, snapctxt->dd + snapctxt->ndd++, --=20 2.31.1