From nobody Tue Oct 22 22:22:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1692005887; cv=none; d=zohomail.com; s=zohoarc; b=bBhpKEDVI09SYXdTCoES0gPyaL/H7/6Qd3v1OHtXoaXeoGijTUPEL/bpVbCEhsAnzy2lxsRngHbGT1zEnqqHv9ULbeRhnK4iF268YOmT6tTBEdMKEKlVwVPHTLNIuG+YH7LTdnHoZcWP1FNWCKcvcej8OkFXWrkok4BH5MJezq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692005887; 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=B3GdlhvAEymI1CyDQ79JkyNtk1xuBDwoogm/lpk8qpw=; b=GJ7prUQhpLzE3dPHjjRrAWR40e6OaZozylXCSy9le1HZdnIl/O37z4DDo7G+V49i/x3T94MlBKxQMfdNohbol8EqHdXAMO6kIDqPPVSRqXVwEiV1YkkvdByxLlwbf0q3AyAcJnzSnWtifg4Z/u8Xmwfv2EMNR4ZTQ6hC+nf1opg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1692005887867295.00099885431086; Mon, 14 Aug 2023 02:38:07 -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-404--FSpwAS-OxW1d9femQj7YA-1; Mon, 14 Aug 2023 05:36:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8EABD80CD90; Mon, 14 Aug 2023 09:36:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 774222026D4B; Mon, 14 Aug 2023 09:36:57 +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 F05761946A48; Mon, 14 Aug 2023 09:36:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 93C7519465A2 for ; Mon, 14 Aug 2023 09:36:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 245F340C2077; Mon, 14 Aug 2023 09:36:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.45.226.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB1C640C2073 for ; Mon, 14 Aug 2023 09:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692005886; 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=B3GdlhvAEymI1CyDQ79JkyNtk1xuBDwoogm/lpk8qpw=; b=RiLFWx3lkJBMnPOJgDE7CMLRsYnvhR8yS8d2wbaH7NjCb5tJbxfhGznimLBDA57DP4aoeD u18crZY3pG2nb1VYDSgaDPiuJtSoiTbaEp3dIgPlCQvPGC/BoxGmR2Iimp/L5gltOs8xJ4 3TlmTg6nkNgKsb/ts7XNEbNsZ8a3Oxs= X-MC-Unique: -FSpwAS-OxW1d9femQj7YA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v3 09/25] qemuSnapshotCreateQcow2Files: use domain definition directly Date: Mon, 14 Aug 2023 11:36:01 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.4 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: 1692005889409100011 Content-Type: text/plain; charset="utf-8"; x-default="true" To create new overlay files when external snapshot revert support is introduced we will be using different domain definition than what is currently used by the domain. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index f43548e29f..50f871baf3 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -183,24 +183,25 @@ qemuSnapshotDomainDefUpdateDisk(virDomainDef *domdef, =20 /** * qemuSnapshotCreateQcow2Files: - * @vm: domain object + * @driver: QEMU driver + * @def: domain definition * @snapdef: snapshot definition * @created: bitmap to store which disks were created * * Create new qcow2 images based on snapshot definition @snapdef and use - * domain object @vm as source for backing images. + * domain definition @def as source for backing images. * * Returns 0 on success, -1 on error. */ static int -qemuSnapshotCreateQcow2Files(virDomainObj *vm, +qemuSnapshotCreateQcow2Files(virQEMUDriver *driver, + virDomainDef *def, virDomainSnapshotDef *snapdef, virBitmap *created) { size_t i; const char *qemuImgPath; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virQEMUDriver *driver =3D ((qemuDomainObjPrivate *) vm->privateData)->= driver; virDomainSnapshotDiskDef *snapdisk =3D NULL; virDomainDiskDef *defdisk =3D NULL; =20 @@ -210,7 +211,7 @@ qemuSnapshotCreateQcow2Files(virDomainObj *vm, for (i =3D 0; i < snapdef->ndisks; i++) { g_autoptr(virCommand) cmd =3D NULL; snapdisk =3D &(snapdef->disks[i]); - defdisk =3D vm->def->disks[i]; + defdisk =3D def->disks[i]; =20 if (snapdisk->snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) continue; @@ -278,7 +279,7 @@ qemuSnapshotCreateInactiveExternal(virQEMUDriver *drive= r, /* If reuse is true, then qemuSnapshotPrepare already * ensured that the new files exist, and it was up to the user to * create them correctly. */ - if (!reuse && qemuSnapshotCreateQcow2Files(vm, snapdef, created) < 0) + if (!reuse && qemuSnapshotCreateQcow2Files(driver, vm->def, snapdef, c= reated) < 0) goto cleanup; =20 /* update disk definitions */ --=20 2.41.0