From nobody Fri Dec 12 14:05:55 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=1765363399; cv=none; d=zohomail.com; s=zohoarc; b=fmITgjTs6PUsjNDKCQhSM5Lx8JaDgQ4I2D50rlL5sHzZ5CLp/jG4zBYg9NF3s6M4HludgJGzrQ4VU9Dy6ZVL2uK+3VD+g0qeA/WjPXooVxrLS79SG1CXgBLysKbJGI3A3hin8vvhl68ouDO+p8T0l85WWaOqUjYfYIg0aurrTT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363399; 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=ypirB31t1uyFxPfdZ1OT321MVwok+3T3SdfgXZeEp6I=; b=SPEqTUHcbpC3+CQVBh4w+/m4EkGbUSW6Hnzdaf6aJ4iGb0YRQUCf2eeLOCsAPrxqOi9EhT8cg9LtznWHDUxJC22mCRndRH7HM2hQSL7hw0+u7HhvvZ72Uo0iCCAhSaWsUtt3qbVy0Oi5bpbVMJ7MD78ePhPrndVsa35x31wwvVs= 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 1765363399898266.2047205561312; Wed, 10 Dec 2025 02:43:19 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id BC3ED3FB97; Wed, 10 Dec 2025 05:43:17 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C2D7241B50; Wed, 10 Dec 2025 05:39:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6A3C241B42; Wed, 10 Dec 2025 05:32:42 -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 D396F41B41 for ; Wed, 10 Dec 2025 05:32:41 -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-539-CRf2AC70PRC5hqHYs53e8g-1; Wed, 10 Dec 2025 05:32:40 -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 712A61956089 for ; Wed, 10 Dec 2025 10:32:39 +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 BCFC730001A5 for ; Wed, 10 Dec 2025 10:32:38 +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=1765362761; 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=ypirB31t1uyFxPfdZ1OT321MVwok+3T3SdfgXZeEp6I=; b=eT2b9jXY9+bLaCGQKrk7uULO7uUNMawBJYZ7vwWmKiKGZPn2/SEWmgH7gWDU0rAFDNwigJ epPuVzGDmI+z8PNGRWucQclGUZNowfqyKf0/f4IMlzzQLpWcD2FU3rW0wIPtTSJpTJCXtW 94VVsNScirjBfKDZBCnsvZd16p91dWI= X-MC-Unique: CRf2AC70PRC5hqHYs53e8g-1 X-Mimecast-MFC-AGG-ID: CRf2AC70PRC5hqHYs53e8g_1765362759 To: devel@lists.libvirt.org Subject: [PATCH 05/10] qemuMigrationSrcToSparseFile: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:26 +0100 Message-ID: <2b059a1947551d5620e84d4ed0cfa574893e0373.1765362608.git.pkrempa@redhat.com> 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: lUKkDsJ29N4N57FWXrvzlLiBUv-ZXxvpPKl03no7194_1765362759 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3ILCUPA2JN5HO43UX5MHHEEJMQ6LUJNY X-Message-ID-Hash: 3ILCUPA2JN5HO43UX5MHHEEJMQ6LUJNY 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: 1765363401835158500 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 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b2d67a1e74..a0ec2f5ff3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7204,14 +7204,14 @@ qemuMigrationSrcToLegacyFile(virDomainObj *vm, static int -qemuMigrationSrcToSparseFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToSparseFile(virDomainObj *vm, const char *path, int *fd, bool bypassCache, virDomainAsyncJob asyncJob) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); VIR_AUTOCLOSE directFd =3D -1; int directFlag =3D 0; bool needUnlink =3D false; @@ -7233,12 +7233,14 @@ qemuMigrationSrcToSparseFile(virQEMUDriver *driver, if (directFd < 0) return -1; - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, = directFd) < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm-= >def, + directFd) < 0) return -1; } - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, *fd)= < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, + *fd) < 0) return -1; if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) @@ -7252,7 +7254,8 @@ qemuMigrationSrcToSparseFile(virQEMUDriver *driver, /* Helper function called while vm is active. */ int -qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, +qemuMigrationSrcToFile(virQEMUDriver *driver G_GNUC_UNUSED, + virDomainObj *vm, const char *path, int *fd, virCommand *compressor, @@ -7291,7 +7294,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, if (migParams && qemuMigrationParamsCapEnabled(migParams, QEMU_MIGRATION_CAP_MAPPED= _RAM)) - rc =3D qemuMigrationSrcToSparseFile(driver, vm, path, fd, bypassCa= che, asyncJob); + rc =3D qemuMigrationSrcToSparseFile(vm, path, fd, bypassCache, asy= ncJob); else rc =3D qemuMigrationSrcToLegacyFile(vm, *fd, compressor, asyncJob); --=20 2.52.0