From nobody Fri Dec 12 14:06:20 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=1765363469; cv=none; d=zohomail.com; s=zohoarc; b=CszybLTC+LhKKdu3lksUJ6hFtdoKMscGu3UQ9XvtaM5b8tM9/DQyJq25fJn3/HF50222RQ66WhqUteZOkHBBFFyfjjEi1AuTnF7HdyVxc4Giux1s/4YjqIWNUipv3iDwIQBhbZoD+u9WkcR4zbP5aFxf1Me3Z6siyf9VjQ3cd2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363469; 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=pg4ijA+CCuAzHLP37/8tKoNoJu8BfaiX7taE5/s/YZA=; b=ja2DP+I778QD6Yl1qWYTVWeiCD1DKzoEu+GQvk5clJUO0Ea1vhsEvhxzUR4GHSG5zxVm0OKAG1i7and5j8osTdPBXIUHdJ1TTv5N8GW0cach4om3CVIqYkO2hOLW9Pkf+84HueSEFX1E418rn6iSAWidlkoYqBUROTqATza03pU= 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 1765363469093412.0774075798872; Wed, 10 Dec 2025 02:44:29 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 32E3943E40; Wed, 10 Dec 2025 05:44:27 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C3F9543F7C; Wed, 10 Dec 2025 05:40:04 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id BCFBE41B41; Wed, 10 Dec 2025 05:32:43 -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 2C34B41B41 for ; Wed, 10 Dec 2025 05:32:43 -0500 (EST) Received: from mx-prod-mc-01.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-278-LcsnRoQCOsmai0UictBLKg-1; Wed, 10 Dec 2025 05:32:41 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 91794195609F for ; Wed, 10 Dec 2025 10:32:40 +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 DBAA830001A5 for ; Wed, 10 Dec 2025 10:32:39 +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=1765362762; 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=pg4ijA+CCuAzHLP37/8tKoNoJu8BfaiX7taE5/s/YZA=; b=LOgYlFYN+3QYDFkpu2Or0QPmqS91ysi5dQyc4BILzHfIzPQpd4YO57PPFS9ZciJzOrqdw0 qH0AiVNDCiSXnNGKaJEc/xJ8Wom0lSQX7V1Gsz2pukiYbEw9xT1fx1vdf8PqweGa1o+sYO R7+gWfb6Z4BoHWsUfUESQ0ZR27Y3xfc= X-MC-Unique: LcsnRoQCOsmai0UictBLKg-1 X-Mimecast-MFC-AGG-ID: LcsnRoQCOsmai0UictBLKg_1765362760 To: devel@lists.libvirt.org Subject: [PATCH 06/10] qemuMigrationSrcToFile: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:27 +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: FBMHIF5_f3vroTVLVELyEOsQVu6xE3_4yapg20b7wt4_1765362760 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SZU5SVBSKXKQLXY522Y26BHVIAK2FOVB X-Message-ID-Hash: SZU5SVBSKXKQLXY522Y26BHVIAK2FOVB 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: 1765363470001158500 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_migration.c | 3 +-- src/qemu/qemu_migration.h | 5 ++--- src/qemu/qemu_saveimage.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3c6dd97c04..abe91b303f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3136,7 +3136,7 @@ doCoreDump(virQEMUDriver *driver, if (!(dump_params =3D qemuMigrationParamsNew())) goto cleanup; - if (qemuMigrationSrcToFile(driver, vm, path, &fd, compressor, + if (qemuMigrationSrcToFile(vm, path, &fd, compressor, dump_params, (dump_flags & VIR_DUMP_BYPASS_CACHE), VIR_ASYNC_JOB_DUMP) < 0) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a0ec2f5ff3..8ae1e4e843 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7254,8 +7254,7 @@ qemuMigrationSrcToSparseFile(virDomainObj *vm, /* Helper function called while vm is active. */ int -qemuMigrationSrcToFile(virQEMUDriver *driver G_GNUC_UNUSED, - virDomainObj *vm, +qemuMigrationSrcToFile(virDomainObj *vm, const char *path, int *fd, virCommand *compressor, diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 51341f453d..db03144207 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -238,15 +238,14 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm, unsigned int flags); int -qemuMigrationSrcToFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToFile(virDomainObj *vm, const char *path, int *fd, virCommand *compressor, qemuMigrationParams *migParams, bool bypassCache, virDomainAsyncJob asyncJob) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int qemuMigrationSrcCancelUnattended(virDomainObj *vm, diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 1b68a09595..c5620c82c5 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -501,7 +501,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, goto cleanup; /* Perform the migration */ - if (qemuMigrationSrcToFile(driver, vm, path, &fd, compressor, savePara= ms, + if (qemuMigrationSrcToFile(vm, path, &fd, compressor, saveParams, (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE), asyncJob) < 0) goto cleanup; --=20 2.52.0