From nobody Fri Oct 18 09:19:03 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=1678722177; cv=none; d=zohomail.com; s=zohoarc; b=EkimbcATGVpPi9YSVvtFmF2xgGQNNxfMUAkYvtJwGz1k5zHfEFzyVM4TVcpmxIG3cXRP2UBysr8NzmqytdbMn8Hh7qLe+K8/YpNeIaIBiFWH1iaQEehqyPjjVGKGQyru/o91Leg66gCM0nUtfNjpg9AxbMPIgi9MyL8cIpK62sI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678722177; 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=Rr+Biiy+qbc/YW/T4BBEacYqc4rgAAYYP0jIIClPSEA=; b=Rij+uO6ysZ1Etm/vQVfJZ0jV4mZqbDamFNeWfei0GqhohybFsJ9SKCLCpEnjFBmH+sVCSi9+miiIXng9/gu3GLdf1KynkGOvBK3cXfVRdB/koIho6wChfUpAui9DUV4nqVYZMBAAxb4w1bcWRHn43IgAqy5BClNljv2GR43HJrQ= 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 1678722177029706.8097462060641; Mon, 13 Mar 2023 08:42:57 -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-151-zzSmB84HMqiZyvek-u0X5w-1; Mon, 13 Mar 2023 11:42:53 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 11FAE100F826; Mon, 13 Mar 2023 15:42:35 +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 F2A4B400F4F; Mon, 13 Mar 2023 15:42:34 +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 CCB4819465A2; Mon, 13 Mar 2023 15:42:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2A81B1946594 for ; Mon, 13 Mar 2023 15:42:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1BAE52166B2F; Mon, 13 Mar 2023 15:42:34 +0000 (UTC) Received: from localhost.localdomain (unknown [10.45.226.242]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C7152166B26 for ; Mon, 13 Mar 2023 15:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678722176; 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=Rr+Biiy+qbc/YW/T4BBEacYqc4rgAAYYP0jIIClPSEA=; b=bIh09onECKI4cKw4nZQgjKGuZpaqQx6hf0/XM6oRVK/FHd9CngI1NyPTxhUEV9fe0xkmoN wXKgIhoofHR9QNYIRGz8kvZu9eky8dxUKZDudK5/8Z5lOTngm1Hz2qGAnqyHxjS6vPULe+ md/lBi5ALT9xC03bNvT1NMPgAHjLCEg= X-MC-Unique: zzSmB84HMqiZyvek-u0X5w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 10/20] qemu_snapshot: rename qemuSnapshotDeleteExternalPrepare Date: Mon, 13 Mar 2023 16:42:11 +0100 Message-Id: <778175dce6b63663886198c48875fb8b9c443425.1678718987.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.10 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: 1678722178883100005 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 af4e2ea6aa..64730dcb0b 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2474,9 +2474,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); @@ -3333,7 +3333,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)) { @@ -3348,7 +3348,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.39.2