From nobody Mon Feb 9 01:58:02 2026 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=1687879177; cv=none; d=zohomail.com; s=zohoarc; b=k67FCov4cC2NziYso00bpTXVic0DKUEtJy5ZDRT6aUr+DnDrUoP9kIQwUQLLb/uNpwmEkOGtViCWkM9NMjPk5DGBbjlh0gmRhonNATiWKQF1BF763yRpViNaMWynJ0f8YWdfF5ztjG4ecYSsPZ6fRxjd6ylYCTOQuPNNU+SAhYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687879177; 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=j0SVWzlr3J4PC4o6HNtRK2ElPSApmMM/D8c5mCVqqmQ=; b=kqB0qo4PJ0WxqbrzihXmWk6OB1dlVj657qs5Fvb3wSBhXqt1qFKNHZDp89cYanUjexEx+Jeh2/kXojjdCdcYELRUsLe6i4FVpqy2Nt7MTt1id3zQeB4ww8tZ0dVc2nGTWddyMkzbuLud0l3QdevnS3hl+6YyZKFP3qIIhWf4F2A= 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 1687879177308812.9290997181982; Tue, 27 Jun 2023 08:19:37 -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-59-rQFg-tkvMNarTBwy1khdcg-1; Tue, 27 Jun 2023 11:15:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06EB48E9C10; Tue, 27 Jun 2023 15:07:59 +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 E612840C2063; Tue, 27 Jun 2023 15:07:58 +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 3A1D3194037E; Tue, 27 Jun 2023 15:07:40 +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 C69AA1946A74 for ; Tue, 27 Jun 2023 15:07:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A706B400E88; Tue, 27 Jun 2023 15:07:36 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.45.225.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49BDB48FB01 for ; Tue, 27 Jun 2023 15:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687879175; 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=j0SVWzlr3J4PC4o6HNtRK2ElPSApmMM/D8c5mCVqqmQ=; b=jODlW8czrs+wY7uikdjtHdsKpT7MpIKo9bWofHiKxKYRt6ttiYeTVj2xSmi29/FOR3NUId 63+TcF3V+aIfEPpsm/xETYTLG9vsfeXK2ablXNEHf+GJEufAvN8pK9tFxE1l9EjTK1SIVR Z2vh83+EUP8Upoz0+V/rxbDiMP1Pzpc= X-MC-Unique: rQFg-tkvMNarTBwy1khdcg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 13/24] qemu_snapshot: rename qemuSnapshotDeleteExternalPrepare Date: Tue, 27 Jun 2023 17:07:16 +0200 Message-ID: <4987f33df1048346f2b6d3e549a300d198fd4c2f.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.1 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: 1687879178279100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The new name reflects that we prepare data for external snapshot deletion and the old name will be used later for different part of code. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index dbf2cdd5db..c5de24917b 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2570,9 +2570,9 @@ qemuSnapshotFindParentSnapForDisk(virDomainMomentObj = *snap, =20 =20 static int -qemuSnapshotDeleteExternalPrepare(virDomainObj *vm, - virDomainMomentObj *snap, - GSList **externalData) +qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm, + virDomainMomentObj *snap, + GSList **externalData) { ssize_t i; virDomainSnapshotDef *snapdef =3D virDomainSnapshotObjGetDef(snap); @@ -3429,7 +3429,7 @@ qemuSnapshotDelete(virDomainObj *vm, g_autoslist(qemuSnapshotDeleteExternalData) tmpData =3D NULL; =20 /* this also serves as validation whether the snapshot can be = deleted */ - if (qemuSnapshotDeleteExternalPrepare(vm, snap, &tmpData) < 0) + if (qemuSnapshotDeleteExternalPrepareData(vm, snap, &tmpData) = < 0) goto endjob; =20 if (!virDomainObjIsActive(vm)) { @@ -3444,7 +3444,7 @@ qemuSnapshotDelete(virDomainObj *vm, =20 /* Call the prepare again as some data require that the VM= is * running to get everything we need. */ - if (qemuSnapshotDeleteExternalPrepare(vm, snap, &externalD= ata) < 0) + if (qemuSnapshotDeleteExternalPrepareData(vm, snap, &exter= nalData) < 0) goto endjob; } else { qemuDomainJobPrivate *jobPriv =3D vm->job->privateData; --=20 2.41.0