From nobody Fri Dec 12 14:05:27 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=1765363235; cv=none; d=zohomail.com; s=zohoarc; b=hcK/6Qkq9HzMOhm7S+WLzVr9lao92nqWfJD977nj7gfUxdifUbLoTZ2d1ZdkYPOJ5ceyKERTH1mw376nsbBRhDKsuh18NLDKU/HXdoXH3BncBmR+nvWdlw32Zxj1uUrGHFXuNn3IY0HJhogIMNUVv5D5QpRW7LKmHxne0skGkl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363235; 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=90Xtt8Qsc8cP5ZejXrQSKV4HDx0k332VVABBTBx5n6s=; b=C1blZgbD+PbR/gvh4f4+FbHd5kNLaUtnV/AlqRqgvyHxRbdkrBM4LV9rm6Icp5jWeGLoX5xt1k1PSeh+h+mL8dmA2KV/dU94fwzr/tSpmPNL2RnPnSRO2U40Oci/L4zZT7LNWJ43H+vrHK98F4QeY0MdkwuLdgP68RaIFaqrYYs= 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 1765363235628659.5215880183733; Wed, 10 Dec 2025 02:40:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 5005F41C4E; Wed, 10 Dec 2025 05:40:26 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6095041C1C; Wed, 10 Dec 2025 05:39:38 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 7ACCD41B41; Wed, 10 Dec 2025 05:32:40 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 C394B41B42 for ; Wed, 10 Dec 2025 05:32:39 -0500 (EST) 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-529-GdROKPPOODm178gJz7Ny0Q-1; Wed, 10 Dec 2025 05:32:38 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 389551956096 for ; Wed, 10 Dec 2025 10:32:37 +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 7C83830001A5 for ; Wed, 10 Dec 2025 10:32:36 +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=1765362759; 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=90Xtt8Qsc8cP5ZejXrQSKV4HDx0k332VVABBTBx5n6s=; b=dzDszmr4YtRHOsnaZEnosqIQBvk1gdah7hn89BAznO7nwONferzLn3iVn/sZ2um9v1Q0ja lTZcMptzMmoowIij7MT8WywAfwKyXjxnN47oN1r7arV2LMq45CquWrsd6/1mzOgmZ2bgqw Yi77AQhTzM3Z/bJ2nREi37AvJDUGtyA= X-MC-Unique: GdROKPPOODm178gJz7Ny0Q-1 X-Mimecast-MFC-AGG-ID: GdROKPPOODm178gJz7Ny0Q_1765362757 To: devel@lists.libvirt.org Subject: [PATCH 03/10] qemuMigrationSrcToLegacyFile: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:24 +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: LEezoVrnn6EfuClNTacbiXPMq1r1v-QcoPzPQJ_heMk_1765362757 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: S6GGJENEFALWBZ55SRYCI6B4M5MPRN6R X-Message-ID-Hash: S6GGJENEFALWBZ55SRYCI6B4M5MPRN6R 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: 1765363237226158500 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_migration.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a64a98046a..32afc788ad 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7142,8 +7142,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver, static int -qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToLegacyFile(virDomainObj *vm, int fd, virCommand *compressor, virDomainAsyncJob asyncJob) @@ -7160,7 +7159,7 @@ qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, * doesn't have to open() the file, so while we still have to * grant SELinux access, we can do it on fd and avoid cleanup * later, as well as skip futzing with cgroup. */ - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, compressor ? pipeFD[1] : fd) < 0) goto cleanup; @@ -7294,7 +7293,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, qemuMigrationParamsCapEnabled(migParams, QEMU_MIGRATION_CAP_MAPPED= _RAM)) rc =3D qemuMigrationSrcToSparseFile(driver, vm, path, fd, bypassCa= che, asyncJob); else - rc =3D qemuMigrationSrcToLegacyFile(driver, vm, *fd, compressor, a= syncJob); + rc =3D qemuMigrationSrcToLegacyFile(vm, *fd, compressor, asyncJob); if (rc < 0) goto cleanup; --=20 2.52.0