From nobody Fri Dec 12 14:07:30 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=1765363537; cv=none; d=zohomail.com; s=zohoarc; b=E9+DmD5ZfH3uqhI8BygdKKmJW4JF4OqZgremA4yo80r60okPghRrq41HtAT4l9Qa62M7rp8zFkmrk5Y3VAoGB8xotXeFoH/tDCAzD+fFu/BADjOJZRQsY6ybxTg1SuELhIdk/0SdttsWUE3VwQ0eRLG21BxRCTDcQy9FQp7wLs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363537; 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=M+HqnoyCX1Xx2hUr22A2XFmigfeC8VXdhVgas5Uo+BE=; b=fS9qX2cZF1hmE1O5qXmROyT1MIzY3zmNqbxARlWbbjlFvLupo4M1k1ZTrqn17ta328ZjqPtUyKhNTYYeSjX83IZIlF3KicA14UunFCpJcqt9kPzvrLNgMP2KnpjRxQriEzSnJbiYtmKvQCsMsr1RYMQKri6NfECCmw87mpTbEcU= 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 1765363537843104.20573000211868; Wed, 10 Dec 2025 02:45:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id D471D41C37; Wed, 10 Dec 2025 05:45:36 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0393441CA5; Wed, 10 Dec 2025 05:40:15 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 00CA841B32; Wed, 10 Dec 2025 05:32:44 -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 2F1A041B41 for ; Wed, 10 Dec 2025 05:32:44 -0500 (EST) 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-283-97fSuVMKMFqiYcPzsTH04w-1; Wed, 10 Dec 2025 05:32:42 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B5D871800343 for ; Wed, 10 Dec 2025 10:32:41 +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 07EEC30001A5 for ; Wed, 10 Dec 2025 10:32:40 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362763; 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=M+HqnoyCX1Xx2hUr22A2XFmigfeC8VXdhVgas5Uo+BE=; b=iHRYi4q6NFCAZ0HeLIt7i8nrPmKUUPBRD68/ZUjgiLeMOTQb63F9ECnYzCTLa1IWIvJzCM Q63jKUiE5oV3A4kq9dTf1aw5ZoeuiU459AWsXNDqrepER7EfnWIUgqpMrpxgj28BtkL8s1 aoPxmKSOr/hZeEz/kEMGgkT2oxJ5OZI= X-MC-Unique: 97fSuVMKMFqiYcPzsTH04w-1 X-Mimecast-MFC-AGG-ID: 97fSuVMKMFqiYcPzsTH04w_1765362761 To: devel@lists.libvirt.org Subject: [PATCH 07/10] qemuSaveImageCreateFd: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:28 +0100 Message-ID: <79b99df73879ad128078ce52807f0fcd8a8f0f80.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: iZ5tS-MP-5Tmh9chAvC-mHw4uXgsbzY1cXcQnUp6Y0k_1765362761 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ABA7EUMSILPOTMACVID2MNRZ5BIMI2FY X-Message-ID-Hash: ABA7EUMSILPOTMACVID2MNRZ5BIMI2FY 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: 1765363538291158500 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_saveimage.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index c5620c82c5..a2e760c462 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -427,15 +427,15 @@ qemuSaveImageDecompressionStop(virCommand *cmd, static int -qemuSaveImageCreateFd(virQEMUDriver *driver, - virDomainObj *vm, +qemuSaveImageCreateFd(virDomainObj *vm, const char *path, virFileWrapperFd **wrapperFd, bool sparse, bool *needUnlink, unsigned int flags) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); int ret =3D -1; VIR_AUTOCLOSE fd =3D -1; int directFlag =3D 0; @@ -458,7 +458,7 @@ qemuSaveImageCreateFd(virQEMUDriver *driver, if (fd < 0) return -1; - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) = < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def= , fd) < 0) return -1; if (!sparse && !(*wrapperFd =3D virFileWrapperFdNew(&fd, path, wrapper= Flags))) @@ -492,7 +492,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, bool sparse =3D data->header.format =3D=3D QEMU_SAVE_FORMAT_SPARSE; /* Obtain the file handle. */ - fd =3D qemuSaveImageCreateFd(driver, vm, path, &wrapperFd, sparse, &ne= edUnlink, flags); + fd =3D qemuSaveImageCreateFd(vm, path, &wrapperFd, sparse, &needUnlink= , flags); if (fd < 0) goto cleanup; --=20 2.52.0