From nobody Mon Feb 9 04:47:44 2026 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=1747323245; cv=none; d=zohomail.com; s=zohoarc; b=JX+oVbwbaDDwtePkVG/rcP+cGBUecnwcYAHv22W7PxBqNf1nJUdy/Bgaq1H5XJJt5PfcpCJBBuFJTbhHvw4gGeB2Xqmp1q9N+kM7C/NY3gyskgFg4L6blAknekfGr4D5umKld/Ki9fGY6jhP2h12XRYPHopIRbr7XtRPUj1Tyoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323245; 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=xxUgPhmfI4Nz9e2Dk2pxzlTLh/wcO+8x/iRyOe2SRoQ=; b=FG+ozRtDjeYn/n+Jvigg58P70WDLu4lfEAVSRIMUSnCe9OPAa5iROhiPUi83ZqrBI+ryRgJ+Q82HRcgQLlEFmY75QvMRUDZAsZTxEWUFShRX1Zv+XRxy3fhXAqKBBhbP1xPdf91LcyyjM5mvczwnj5EsYGY7c/vQh7nUhEhd1BQ= 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 1747323245698329.104365325349; Thu, 15 May 2025 08:34:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BF622150C; Thu, 15 May 2025 11:34:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7197E147C; Thu, 15 May 2025 11:29:53 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F1B651419; Thu, 15 May 2025 11:29:49 -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 BAED41361 for ; Thu, 15 May 2025 11:29:29 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-248--L66kSUTPY--DBHCrDVe0w-1; Thu, 15 May 2025 11:29:28 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 36A95180045C for ; Thu, 15 May 2025 15:29:27 +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 3784C18003FC; Thu, 15 May 2025 15:29:25 +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=1747322969; 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=VqdnZfrh30J4/HjV7ykXf2259dCn4HGaQ4FFWGMrGvE=; b=bkvwHQkgJ5cR9ZmkAGFIixu5KqwqLs7Jfu7Plh3IudbVHRUMt5aWDIN6ljFDLO2lu9+Rwg 9wV2qZVfr3sqO6u2oYnmCsPuhPua+kPD3ShgTBpU/FF26t4kcFhf4sNENPOlKrm3T3PYmc 9ql8+thUY4XAi2ocD4rABAcHzzp+74c= X-MC-Unique: -L66kSUTPY--DBHCrDVe0w-1 X-Mimecast-MFC-AGG-ID: -L66kSUTPY--DBHCrDVe0w_1747322967 To: devel@lists.libvirt.org Subject: [PATCH 10/17] qemuCheckpointDiscardAllMetadata: Remove 'driver' argument Date: Thu, 15 May 2025 17:28:55 +0200 Message-ID: <9ac8ec23ed0dd374a91fb45fdf47af0240002edd.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: 97S1nVmkayuJ6dUDFyHws-xYEEo8FaCAUaMTcK9Cy7U_1747322967 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: N7PMPKQHO477H562LOOHLMXD4FPG5E6A X-Message-ID-Hash: N7PMPKQHO477H562LOOHLMXD4FPG5E6A 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: 1747323247623116600 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_checkpoint.c | 5 ++--- src/qemu/qemu_checkpoint.h | 3 +-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index cf44e45aa1..af847cf1f2 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -305,11 +305,10 @@ qemuCheckpointDiscard(virQEMUDriver *driver, int -qemuCheckpointDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm) +qemuCheckpointDiscardAllMetadata(virDomainObj *vm) { virQEMUMomentRemove rem =3D { - .driver =3D driver, + .driver =3D QEMU_DOMAIN_PRIVATE(vm)->driver, .vm =3D vm, .metadata_only =3D true, .momentDiscard =3D qemuCheckpointDiscard, diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h index fc1c35cdd2..2c72213598 100644 --- a/src/qemu/qemu_checkpoint.h +++ b/src/qemu/qemu_checkpoint.h @@ -33,8 +33,7 @@ qemuCheckpointObjFromName(virDomainObj *vm, const char *name); int -qemuCheckpointDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm); +qemuCheckpointDiscardAllMetadata(virDomainObj *vm); virDomainCheckpointPtr qemuCheckpointCreateXML(virDomainPtr domain, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 235bfd65cb..fe969ca3d3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5807,7 +5807,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver, VIR_WARN("unable to remove snapshot directory %s", snapDir); } /* Remove any checkpoint metadata prior to removing the domain */ - if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0) { + if (qemuCheckpointDiscardAllMetadata(vm) < 0) { VIR_WARN("unable to remove all checkpoints for domain %s", vm->def->name); } else { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a34d6f1437..546545dd01 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6599,7 +6599,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, ncheckpoints); goto endjob; } - if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0) + if (qemuCheckpointDiscardAllMetadata(vm) < 0) goto endjob; } --=20 2.49.0