From nobody Fri Dec 12 14:07:31 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=1765363615; cv=none; d=zohomail.com; s=zohoarc; b=QJlcUsQOo9YijYmaV3pDAAPnUpx9GYA+LuxKKj9NRZN0pCnSnATrXLThhHXB+qtZ6a6oQhc2FFw9CsgBAeXOY/DCOPfYGbC5wOpFuBBKFOFd7QsHTAp7I4O76hm1GIp4K3Z0gyB2LMDH2wJHYM4BUzRgUTrJ58+pDcfeMWxNZVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363615; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=4iH056fu4RjTcjyTPdewVpUubj3+pSfyYp78buPq6Is=; b=IdCJ3kGKWhqoi2E6eiSQpQ3Z8K93FN1Od2Ig7IWL2Cf/h3lpk6k6uDLsjFodjNnezFaxjiVz9DD7wWa808pKm1iEZNW+6Mc1OQoD6BY9tXtHWyt6Evdgs5bdEoa5rxjABFhnT5ashUpyfZ+I50ee1dAOZdhLpYfeGgKea18w3qA= 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 1765363615752749.6308669591297; Wed, 10 Dec 2025 02:46:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id EB7BB3FB96; Wed, 10 Dec 2025 05:46:52 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C8EFF41C70; Wed, 10 Dec 2025 05:40:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id B9EF841B41; Wed, 10 Dec 2025 05:32:45 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 20A7041B32 for ; Wed, 10 Dec 2025 05:32:45 -0500 (EST) Received: from mx-prod-mc-03.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-364-I1edpsElOFqzgEOzuGqz5g-1; Wed, 10 Dec 2025 05:32:43 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D1C5E1956060 for ; Wed, 10 Dec 2025 10:32:42 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 298CB30001A8 for ; Wed, 10 Dec 2025 10:32:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362764; h=from:from: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; bh=4iH056fu4RjTcjyTPdewVpUubj3+pSfyYp78buPq6Is=; b=XE0mdsgkcaCqf/uPw3jc8itMVIut0zXyAQFNgB7uOVysHhrbPRHozPyadyBIdutK5nHeDg AgrN4O1BuacGD6Ilnc6mrImak31DnmTQg5EkxM/vTG86ac2i9nOYvAzhvt/JYeb3qZVSOw aCttn9m0JyzX7ZSBtMeM0y0GgPaV3h8= X-MC-Unique: I1edpsElOFqzgEOzuGqz5g-1 X-Mimecast-MFC-AGG-ID: I1edpsElOFqzgEOzuGqz5g_1765362762 To: devel@lists.libvirt.org Subject: [PATCH 08/10] qemuSaveImageCreate: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:29 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: wdpi_HSMlrwyebhMFY0Lg3Pncw9MB2uaG_PVh4J8RFI_1765362762 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NDGSTVAXSF22YLLVWXICAW3E37JRASI5 X-Message-ID-Hash: NDGSTVAXSF22YLLVWXICAW3E37JRASI5 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363616530158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_saveimage.c | 6 +++--- src/qemu/qemu_saveimage.h | 3 +-- src/qemu/qemu_snapshot.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abe91b303f..3f154969b8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2682,7 +2682,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, (flags & VIR_DOMAIN_SAVE= _BYPASS_CACHE)))) goto endjob; - ret =3D qemuSaveImageCreate(driver, vm, path, data, compressor, + ret =3D qemuSaveImageCreate(vm, path, data, compressor, saveParams, flags, VIR_ASYNC_JOB_SAVE); if (ret < 0) goto endjob; diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index a2e760c462..09217a9c9d 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -475,8 +475,7 @@ qemuSaveImageCreateFd(virDomainObj *vm, * the caller needs to make sure that the processors are stopped and do al= l other * actions besides saving memory */ int -qemuSaveImageCreate(virQEMUDriver *driver, - virDomainObj *vm, +qemuSaveImageCreate(virDomainObj *vm, const char *path, virQEMUSaveData *data, virCommand *compressor, @@ -484,7 +483,8 @@ qemuSaveImageCreate(virQEMUDriver *driver, unsigned int flags, virDomainAsyncJob asyncJob) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); bool needUnlink =3D false; int ret =3D -1; int fd =3D -1; diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index 1fd96751a2..b46cabffe5 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -119,8 +119,7 @@ qemuSaveImageDecompressionStop(virCommand *cmd, const char *path); int -qemuSaveImageCreate(virQEMUDriver *driver, - virDomainObj *vm, +qemuSaveImageCreate(virDomainObj *vm, const char *path, virQEMUSaveData *data, virCommand *compressor, diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5ceaff3554..c8954fd805 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1756,7 +1756,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, if (!(snap_params =3D qemuMigrationParamsNew())) goto cleanup; - if (qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile, + if (qemuSaveImageCreate(vm, snapdef->memorysnapshotfile, data, compressor, snap_params, 0, VIR_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; --=20 2.52.0