From nobody Sun Feb 8 23:46:59 2026 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=1747323219; cv=none; d=zohomail.com; s=zohoarc; b=lwdRGWcSMuhg5UkITQIuIDXhhKsi4fgbg+VRjkKAZzaLQ6Fn9nHl/ENxUqL+R9cxSEhX1q4BJi/MgGvi1Sl+l1axeD/uiIbHsG2VhPiuMs/zeZt6995qjam94imqoQsCiG/6CjCsluhZqpNJM4XFFj1rize3fYNTIttJDWjgpuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323219; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=u9KkLcCNR3Etq1DHWDD9FfU+ghL4GGZ2mBX9B2Q15is=; b=JYc5EnKhKVkb+If7gJXZXRjcEpTliRVginLE9bDVjtmHHv6vNAytQHKal6dA7iIJW1eOCPp5gZFbrafss6Z0/eyCZIXhz5Lapb2pc6CHHVbWRG44icUdxLvKKWzKkc+ALBEOkt5byePuD7oaHKYVixxGPnaRbMcCkL62pAJwzYU= 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 1747323219974751.8039998629929; Thu, 15 May 2025 08:33:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EDD8D1490; Thu, 15 May 2025 11:33:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C831C1276; Thu, 15 May 2025 11:29:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 520B01345; Thu, 15 May 2025 11:29:42 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 29A751345 for ; Thu, 15 May 2025 11:29:28 -0400 (EDT) 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-6-zpBtXqYlMHSWvkKj_neGbg-1; Thu, 15 May 2025 11:29:26 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 B3A25180056F for ; Thu, 15 May 2025 15:29:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.37]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B435F18003FC; Thu, 15 May 2025 15:29:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747322967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eXzDBKOUF9NPDZp8sQSRiwYjn1d2inuu7AN9UcVtX/Y=; b=CkmI3dVHDGAJ44svxqEWtAlMReYOcwwin6wIQbwEZY4Y3DBULnjTxwEwVLHSvXRrmVtRzA ZRS1+y7i3JaUKYC9KC/TXI0SYs6MryhVljgU+9rsiVanuYuUvceWa+X8QZkxFebAANSUll x/l6KIeoC5E3sB+sKiUDC++pUgMY5DI= X-MC-Unique: zpBtXqYlMHSWvkKj_neGbg-1 X-Mimecast-MFC-AGG-ID: zpBtXqYlMHSWvkKj_neGbg_1747322965 To: devel@lists.libvirt.org Subject: [PATCH 09/17] qemuExtDevicesCleanupHost: Use 'virQEMUDriverConfig' instead of 'virQEMUDriver' Date: Thu, 15 May 2025 17:28:54 +0200 Message-ID: <7e1b5c04e2aaef8f07143fb1a7d927aa68f6745a.1747322588.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: kJXNZVMzAQ_zrKcmy1F-0AEZK88vovI6XPzuMmz6esw_1747322965 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3TAHHMGNIXN6WJLACBVM5JEJ4FDMSZV5 X-Message-ID-Hash: 3TAHHMGNIXN6WJLACBVM5JEJ4FDMSZV5 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Peter Krempa X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1747323221373116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Refactor the function and all callees to use the driver config instead. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_extdevice.c | 18 ++++++++++-------- src/qemu/qemu_extdevice.h | 4 ++-- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_tpm.c | 14 +++++--------- src/qemu/qemu_tpm.h | 4 ++-- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5603feaa05..235bfd65cb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5816,7 +5816,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver, if (rmdir(chkDir) < 0 && errno !=3D ENOENT) VIR_WARN("unable to remove checkpoint directory %s", chkDir); } - qemuExtDevicesCleanupHost(driver, vm->def, flags, migration); + qemuExtDevicesCleanupHost(cfg, vm->def, flags, migration); } diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 31c7a14156..8df93a77ce 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -58,7 +58,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver, /* * qemuExtDevicesInitPaths: * - * @driver: QEMU driver + * @cfg: QEMU driver config * @def: domain definition * * Initialize paths of external devices so that it is known where state is @@ -66,7 +66,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver, * changes. */ int -qemuExtDevicesInitPaths(virQEMUDriver *driver, +qemuExtDevicesInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def) { size_t i; @@ -75,7 +75,7 @@ qemuExtDevicesInitPaths(virQEMUDriver *driver, virDomainTPMDef *tpm =3D def->tpms[i]; if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR && - qemuExtTPMInitPaths(driver, def, tpm) < 0) + qemuExtTPMInitPaths(cfg, def, tpm) < 0) return -1; } @@ -95,10 +95,11 @@ int qemuExtDevicesPrepareDomain(virQEMUDriver *driver, virDomainObj *vm) { + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D 0; size_t i; - if (qemuExtDevicesInitPaths(driver, vm->def) < 0) + if (qemuExtDevicesInitPaths(cfg, vm->def) < 0) return -1; for (i =3D 0; i < vm->def->nvideos; i++) { @@ -151,21 +152,21 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver, void -qemuExtDevicesCleanupHost(virQEMUDriver *driver, +qemuExtDevicesCleanupHost(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainUndefineFlagsValues flags, bool migration) { size_t i; - if (qemuExtDevicesInitPaths(driver, def) < 0) + if (qemuExtDevicesInitPaths(cfg, def) < 0) return; for (i =3D 0; i < def->ntpms; i++) { virDomainTPMDef *tpm =3D def->tpms[i]; if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - qemuExtTPMCleanupHost(driver, tpm, flags, migration); + qemuExtTPMCleanupHost(cfg, tpm, flags, migration); } } @@ -282,10 +283,11 @@ qemuExtDevicesStop(virQEMUDriver *driver, virDomainObj *vm, bool migration) { + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDef *def =3D vm->def; size_t i; - if (qemuExtDevicesInitPaths(driver, def) < 0) + if (qemuExtDevicesInitPaths(cfg, def) < 0) return; for (i =3D 0; i < def->nvideos; i++) { diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index 36f7fb77a8..a8ed2aa7e4 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -31,7 +31,7 @@ int qemuExtDeviceLogCommand(virQEMUDriver *driver, G_GNUC_WARN_UNUSED_RESULT; int -qemuExtDevicesInitPaths(virQEMUDriver *driver, +qemuExtDevicesInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; @@ -45,7 +45,7 @@ int qemuExtDevicesPrepareHost(virQEMUDriver *driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; -void qemuExtDevicesCleanupHost(virQEMUDriver *driver, +void qemuExtDevicesCleanupHost(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainUndefineFlagsValues flags, bool migration) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bed517184f..5636d4fb76 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9577,7 +9577,7 @@ qemuProcessReconnect(void *opaque) if (qemuDomainMasterKeyReadFile(priv) < 0) goto error; - if (qemuExtDevicesInitPaths(driver, obj->def) < 0) + if (qemuExtDevicesInitPaths(cfg, obj->def) < 0) goto error; /* If we are connecting to a guest started by old libvirt there is no diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 0d3be3971a..b2f76e6b8b 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -926,7 +926,7 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm, /** * qemuTPMEmulatorCleanupHost: - * @driver: QEMU driver + * @cfg: QEMU driver config * @tpm: TPM definition * @flags: flags indicating whether to keep or remove TPM persistent state * @migration: whether cleanup is due to a successful outgoing or failed @@ -935,13 +935,11 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm, * Clean up persistent storage for the swtpm. */ static void -qemuTPMEmulatorCleanupHost(virQEMUDriver *driver, +qemuTPMEmulatorCleanupHost(virQEMUDriverConfig *cfg, virDomainTPMDef *tpm, virDomainUndefineFlagsValues flags, bool migration) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - /* Never remove the state in case of migration with shared storage. */ if (migration && virFileIsSharedFS(tpm->data.emulator.source_path, cfg->sharedFiles= ystems) =3D=3D 1) @@ -1275,12 +1273,10 @@ qemuTPMCanMigrateSharedStorage(virDomainDef *def) int -qemuExtTPMInitPaths(virQEMUDriver *driver, +qemuExtTPMInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainTPMDef *tpm) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - return qemuTPMEmulatorInitPaths(tpm, cfg->swtpmStorageDir, cfg->swtpmLogDir, @@ -1311,12 +1307,12 @@ qemuExtTPMPrepareHost(virQEMUDriver *driver, void -qemuExtTPMCleanupHost(virQEMUDriver *driver, +qemuExtTPMCleanupHost(virQEMUDriverConfig *cfg, virDomainTPMDef *tpm, virDomainUndefineFlagsValues flags, bool migration) { - qemuTPMEmulatorCleanupHost(driver, tpm, flags, migration); + qemuTPMEmulatorCleanupHost(cfg, tpm, flags, migration); } diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index 37813087cf..f0f16392a1 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -22,7 +22,7 @@ #include "vircommand.h" -int qemuExtTPMInitPaths(virQEMUDriver *driver, +int qemuExtTPMInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainTPMDef *tpm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) @@ -35,7 +35,7 @@ int qemuExtTPMPrepareHost(virQEMUDriver *driver, ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; -void qemuExtTPMCleanupHost(virQEMUDriver *driver, +void qemuExtTPMCleanupHost(virQEMUDriverConfig *cfg, virDomainTPMDef *tpm, virDomainUndefineFlagsValues flags, bool migration) --=20 2.49.0