From nobody Tue Sep 9 03:16:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323272; cv=none; d=zohomail.com; s=zohoarc; b=DzGTa4MPQrZHbb0YxlEa6rFKIK9RpfHwwY602T3l705q6YwjhCWaHzU8EhBFDu62MciH/BoQUkAwSUmFle9ppXOIC8PN+IqfBfIplTHypW8vG16rXLX20/sBGM5UQSfoKGBP5SyPVoK9QeEFBL+urCR8OuKKh6vGaX9iSefuTcg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323272; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=W6Y4rblUOYZ3Te2pP9FfOYdLU1J53H88jrdUMHik7zc=; b=PnmWZCLm9AHIq1m3853dWZ8Wfq6Uu1jbkmyTp4S/LoIYES6AGlEaB9A26g8MyE/Zjv4GY9z9H3Gi96TWvV2V9oMw2hIaF+qw/HG+kYAnGAsD7yoASImwgVSGq9LDItxbcDAQlWlbMYqNaqgn8FcGK2qYpn2Uw+02F3MMSI8EX2U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747323272137169.96305301199686; Thu, 15 May 2025 08:34:32 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1ED42151F; Thu, 15 May 2025 11:34:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3B22F12C7; Thu, 15 May 2025 11:29:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8293C1474; Thu, 15 May 2025 11:29:50 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id ECCDC1371 for ; Thu, 15 May 2025 11:29:30 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-vTYSBEj7N92hnRCelOPvuQ-1; Thu, 15 May 2025 11:29:29 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2D671956086 for ; Thu, 15 May 2025 15:29:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.37]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AE75018003FC; Thu, 15 May 2025 15:29:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747322970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wuBKPzYnC4/Nref1N87cC492kOqS9w68M+UCBnrKNsc=; b=arlHUu6GjusAzGT/VK0VGasZiwsD4HZHZwS2ue5G5D4CxEy48mtzfoYCdksW4Gx+2i2cXW Kv+Kq18xr2fD7gUv0Pchf7DXtTRl/h6DVNhcY+qrFHdP9W0Brox5Hrz3vZdb3Q0XnhzZzZ J0Ahnihg6G7Sq7prkY5/aXo3NlZS8W4= X-MC-Unique: vTYSBEj7N92hnRCelOPvuQ-1 X-Mimecast-MFC-AGG-ID: vTYSBEj7N92hnRCelOPvuQ_1747322968 To: devel@lists.libvirt.org Subject: [PATCH 11/17] qemuSnapshotDiscardAllMetadata: Remove 'driver' argument Date: Thu, 15 May 2025 17:28:56 +0200 Message-ID: <9625b6dca4bbc8ef4db3d55aa1ea7fe799002ede.1747322588.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: DRETceUvTi85v1Bf6d_MBzIrcFcH8TxV_jgxJFkXJK0_1747322968 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OM4YMPVMV6J4GQKHT5KYAYCJT5XDZSXJ X-Message-ID-Hash: OM4YMPVMV6J4GQKHT5KYAYCJT5XDZSXJ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Peter Krempa X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747323273810116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function can extract it from @vm. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_snapshot.c | 5 ++--- src/qemu/qemu_snapshot.h | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fe969ca3d3..fa1615ceba 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5797,7 +5797,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver, g_autofree char *chkDir =3D NULL; /* Remove any snapshot metadata prior to removing the domain */ - if (qemuSnapshotDiscardAllMetadata(driver, vm) < 0) { + if (qemuSnapshotDiscardAllMetadata(vm) < 0) { VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); } else { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 546545dd01..6d43c2415c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6587,7 +6587,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, nsnapshots); goto endjob; } - if (qemuSnapshotDiscardAllMetadata(driver, vm) < 0) + if (qemuSnapshotDiscardAllMetadata(vm) < 0) goto endjob; } if (!virDomainObjIsActive(vm) && diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index b66b83e230..db5ba1eece 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -4135,11 +4135,10 @@ qemuSnapshotDiscard(virQEMUDriver *driver G_GNUC_UN= USED, int -qemuSnapshotDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm) +qemuSnapshotDiscardAllMetadata(virDomainObj *vm) { virQEMUMomentRemove rem =3D { - .driver =3D driver, + .driver =3D QEMU_DOMAIN_PRIVATE(vm)->driver, .vm =3D vm, .metadata_only =3D true, .momentDiscard =3D qemuSnapshotDiscard, diff --git a/src/qemu/qemu_snapshot.h b/src/qemu/qemu_snapshot.h index f38c2acfb3..2e5c3b5423 100644 --- a/src/qemu/qemu_snapshot.h +++ b/src/qemu/qemu_snapshot.h @@ -50,8 +50,7 @@ qemuSnapshotRevert(virDomainObj *vm, unsigned int flags); int -qemuSnapshotDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm); +qemuSnapshotDiscardAllMetadata(virDomainObj *vm); int qemuSnapshotDelete(virDomainObj *vm, --=20 2.49.0