From nobody Mon Sep 8 17:12:43 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=1752748557; cv=none; d=zohomail.com; s=zohoarc; b=azbu56U90OzUWqh4H3sSC9/UJ5usz/maKD8q9t/Zs0/VQ3oNj6IQAWkS9akoSsKzT46IG71Vv31zOv2w/ATymcmdZ86BDFUQw1yvd3mB+X9FTujq3sChyIuJKnoHidivCbuEmaU+ZxYDSJLH3K57asDqYMSqj+4BZkBykE7TQuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752748557; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=YvKDJLf+84lvo5Az+NBDQVu9j2XUuXwFzPm01eQzaIs=; b=fuu5/CtUeZqACdgNhLS4MIMJkNsxAaXpoOuS/8Ci3MgEqh33d3gIVI4XLc/KRZd4wUsK9BYNP0K15bOXTUHW2N/mvTdrsLgcMZncdZLayuM7ioarAF+6xB4W5yOZGNu8iXk9DC6YlpBuUbl/f9WsL9yiyH4ulNAXX5g4nQBhUqE= 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 1752748557871581.2789901781331; Thu, 17 Jul 2025 03:35:57 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id ECD6F11C9; Thu, 17 Jul 2025 06:35:56 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A0AD41485; Thu, 17 Jul 2025 06:34:59 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 51A2C1182; Thu, 17 Jul 2025 06:34:51 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 D161FD46 for ; Thu, 17 Jul 2025 06:34:50 -0400 (EDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-389-KNXBpb8fN9ug1KtH_jaFnA-1; Thu, 17 Jul 2025 06:34:49 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-454dee17a91so6606865e9.3 for ; Thu, 17 Jul 2025 03:34:48 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4562e886113sm47330815e9.23.2025.07.17.03.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 03:34:46 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 54EB8C3A28CC for ; Thu, 17 Jul 2025 12:34:45 +0200 (CEST) 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_PASS 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=1752748490; 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=xWhyc8UPM3OtWphJ0bH7jExrdcZ2ZHQcgTHAR1TUSFM=; b=CItrlXVWdkW9C6ZAZgIIr4tGPBvBK/VX73Wbs2qXyC+1ZXhAPOjrLnBAaXUM7b+171FSjn DtaSPZd2S2YZ6dFatWApvnq1yGhpugWjHF1BSCEoDcAC9aW8R7C9GbBVn0bF8OIxCb/lqG gtc3moKwuMlM2U9mQulNvrqBmcUhTeg= X-MC-Unique: KNXBpb8fN9ug1KtH_jaFnA-1 X-Mimecast-MFC-AGG-ID: KNXBpb8fN9ug1KtH_jaFnA_1752748488 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752748488; x=1753353288; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xWhyc8UPM3OtWphJ0bH7jExrdcZ2ZHQcgTHAR1TUSFM=; b=gIuoPGOxn8MSFZdi1NL/GEVSm4fhnGLltIGLXFhn21EbccxPZqy4cVvp6wPu2XP52f 9Mr50obfO2WpcZzI4vJAYytGBpnLlPZnf8hyOTW0MTfb5WS0+XdE/hKTAoajqA6bfu2A WZgEjhrD6jwGcHPLIoGVu2NrADUMyomDeQnv/B4DIqv6dX8cTj09RlAqwYYEKuTW918d GpFxahFr2KE3N+rXWjiINor+QmT1roz4bFmjLDT4kUafPPHqvvZBB2BHFN5JGE+TdoQd 5k/oDjB02sK85Eq++V6sHDU1jDv/dbCrWwi5DWZwC5u6AU9SJY8ew2AnThHdfvoQX3DJ yojg== X-Gm-Message-State: AOJu0YzPK6ixmx4TbLmLcFdH+Y6LlV70ib4bpp2wMsYz5drrQ9JHAm7B jAvq2oUjXnOqMp+da2WmgGY6b1l35KP+mW5uWfDYSKCphcubaUcCZIP/F73hjTb89eDqhtnUqB4 m/sNDPLPW5uxDDr5KZ0aD6hMCDKCjANBe25ODbF7QkjTXIVSTSz+bEAdrYXggg1Jr/HHCtDn5l3 xT1lMq2v4LBIO/hu4ZHJqdLlu4E7CKW42O+GsoK7kgiFo= X-Gm-Gg: ASbGncs4EV4bO9wSGiaTxBpF5ry7JzIG5ipZzhHwSCPj67OJKorV51bqQUhUv+LVmqO RZmcrmR/QsEW16dxsvtQEVEVfpiIl181JIgsPryiwK4a66tbVXJ5R0T76tjmPNheUhegVmJcOP4 DC+ap5T10o8HhcdT3xm0pzJxON6m2/vFtnc7x9Ll8II5KmcGJFft/2sPWt1HC/4q8EWn781pwKu N7lQqLDfIpstRCY7WaZfAINxJdMM0IIiz7nf1qPFgu6lul7iqcM1ZQiBjnkATUHZ5xpLJ7amOUn mVu/1GEasFlitEFlslI0oiXMNRwEtFb0fPx85ForvRkUvDZw X-Received: by 2002:a05:600c:3491:b0:454:ab1a:8c39 with SMTP id 5b1f17b1804b1-4562e3a3a12mr42878985e9.26.1752748487712; Thu, 17 Jul 2025 03:34:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWvTjFNft3lKW03Wh7b6/bJ4CD2uHRSFlolWQqA1pOe3mvXtX8sHLm2eehzDk2/f8uxwuULw== X-Received: by 2002:a05:600c:3491:b0:454:ab1a:8c39 with SMTP id 5b1f17b1804b1-4562e3a3a12mr42878655e9.26.1752748487077; Thu, 17 Jul 2025 03:34:47 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 1/3] qemu_tpm: Rename qemuTPMHasSharedStorage -> qemuTPMDomainHasSharedStorage Date: Thu, 17 Jul 2025 12:34:41 +0200 Message-ID: X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hwgjcwjCmWl7YJoFDppLeEp69z3SHe2PqSmawZdn6B8_1752748488 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NIQBZAK7GWDUHZ3EF4CSBTLMG6END2WX X-Message-ID-Hash: NIQBZAK7GWDUHZ3EF4CSBTLMG6END2WX X-MailFrom: mkletzan@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 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: Martin Kletzander via Devel Reply-To: Martin Kletzander X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1752748558483116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander The function deals with the whole domain and the part that handles one TPM will be useful elsewhere and hence extracted later. This rename makes it possible for the new function to use the original name of this renamed one. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_tpm.c | 8 ++++---- src/qemu/qemu_tpm.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c8974dbc5b97..b22248e3b92f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1721,7 +1721,7 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm, } } =20 - if (qemuTPMHasSharedStorage(driver, vm->def) && + if (qemuTPMDomainHasSharedStorage(driver, vm->def) && !qemuTPMCanMigrateSharedStorage(vm->def)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("the running swtpm does not support migration= with shared storage")); diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index b2f76e6b8b31..8c104ab1b303 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -1150,7 +1150,7 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, virCommandSetPidFile(cmd, pidfile); virCommandSetErrorFD(cmd, &errfd); =20 - if (incomingMigration && qemuTPMHasSharedStorage(driver, vm->def)) { + if (incomingMigration && qemuTPMDomainHasSharedStorage(driver, vm->def= )) { /* If the TPM is being migrated over shared storage, we can't * lock all files before labeling them: the source swtpm * process is still holding on to the lock file, and it will @@ -1219,8 +1219,8 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, =20 =20 bool -qemuTPMHasSharedStorage(virQEMUDriver *driver, - virDomainDef *def) +qemuTPMDomainHasSharedStorage(virQEMUDriver *driver, + virDomainDef *def) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; @@ -1346,7 +1346,7 @@ qemuExtTPMStop(virQEMUDriver *driver, return; =20 qemuTPMEmulatorStop(cfg->swtpmStateDir, shortName); - if (migration && qemuTPMHasSharedStorage(driver, vm->def)) + if (migration && qemuTPMDomainHasSharedStorage(driver, vm->def)) restoreTPMStateLabel =3D false; =20 if (qemuSecurityRestoreTPMLabels(driver, vm, restoreTPMStateLabel, fal= se) < 0) diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index f0f16392a165..2d633fe36b84 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -61,8 +61,8 @@ int qemuExtTPMSetupCgroup(virQEMUDriver *driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 -bool qemuTPMHasSharedStorage(virQEMUDriver *driver, - virDomainDef *def) +bool qemuTPMDomainHasSharedStorage(virQEMUDriver *driver, + virDomainDef *def) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 --=20 2.50.1 From nobody Mon Sep 8 17:12:43 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=1752748537; cv=none; d=zohomail.com; s=zohoarc; b=fJhtLBkifwCZXZIYGQMnOY0MgRyet98TEX256ASZtuOnFu9rKMi6BaBedNo+6ULiJlDGAutE7WoSzqbvmrB/SUs9MYg/2eZUIpSWcI5HdcR83lj011ryE8yr5UrdU5HEk1kTeaufEOXqH6Qr19ppf5eIgWCHNO2md+t6q9ZBYGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752748537; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=U2LNO5L4VOFN6iB0FfDFM/5jAwrdTXEGI0UQ/V+4DEQ=; b=dg5nonrD1O/DZkZwMJmtbX/qAi+jf7Ktm4Cg6hZfhAu4QP5lWPRVpS/Yx+WT4YlJV8D6pYroHn5SDfKVllvH8FCslUzdboqiiksdUn6GMRHx2cbef4aQwibBMU+is71589Aw0ZVZBciowtzIaR5SXkuLEsH6IHcTL0+qitD9sK4= 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 1752748537598534.3887696820843; Thu, 17 Jul 2025 03:35:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8717A11FF; Thu, 17 Jul 2025 06:35:36 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AC70E124F; Thu, 17 Jul 2025 06:34:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B5C5C1171; Thu, 17 Jul 2025 06:34:50 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 38193110A for ; Thu, 17 Jul 2025 06:34:50 -0400 (EDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-vxIomd8wPJW9srlaocGPYw-1; Thu, 17 Jul 2025 06:34:48 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4561dfd07bcso4869385e9.1 for ; Thu, 17 Jul 2025 03:34:48 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4562e7f2d4fsm48250985e9.4.2025.07.17.03.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 03:34:46 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 60810C3A28CD for ; Thu, 17 Jul 2025 12:34:45 +0200 (CEST) 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_PASS 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=1752748489; 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=4nwPhJsxdmfrsK0YJ5/1Yf+DkH7plAkVHpsd7rFpH3U=; b=V/oZ26gLxLk8gpMi02f7YeFQ4c76gvISjRTwhKqM7yUcuauu9SsKlcdbs51Qxu4CXz4+wG YMzOqG3L5jt6gil1+9LeRUVK0Jt1GTHTDt5CfMfKPMe2QJvLjCPU6DHTJ1o7VLK7VRy/Mb +0Hn9udImTu4dwf65lFXPbw/TqWwx30= X-MC-Unique: vxIomd8wPJW9srlaocGPYw-1 X-Mimecast-MFC-AGG-ID: vxIomd8wPJW9srlaocGPYw_1752748487 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752748487; x=1753353287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4nwPhJsxdmfrsK0YJ5/1Yf+DkH7plAkVHpsd7rFpH3U=; b=TJZGOh08DSxQ5URWJvHOUhFHvMhsEtfl5U/SKaEfiyWcP7rAqnXieTw1VQUC441UyY xPecoMMcSPULrTqIjbv4Xrwrc88CkrfBKsxpyHdTPz74CN63SQXHcqAgmIuQZ/cPrWyL 9WOhYhqkWov5B5VAdK9DRgXQ2TYHWKEd3rufZeydpjcaK0a889H+SX1bDLsWrYbDP1HY dmbjgoFa+QX3dzR9B2ZVE4E8/BZK8/bIzECzQvf6rjRVE6pHyyrccX2EoZOQdHnZ+MrO p4eW1FiMsErKgZUtre2c0Bgj2yTFUwd0j8S3VI6kKIue7DSesBg+msO4t13F9FFpuFEh mwXg== X-Gm-Message-State: AOJu0YznKwGJnj7f6arArXD/9qhUbZu2H4vQ5EaQEuYguM86E6iEGW9Z 0cGLOSfhuR1Lt1U5G/M0OV/0mrVSTEqLSke2e6BtNXTG+pRKhVDYgwlvYcCOMo7H0DdOcGcWF+B sl6DSugzJODp6rDuIAU3c8qXIebnNOsmiiux198vNqaZJ2pGaDBWeZ50uoPInJj/M+cF3NZyufV qHfsQrywpdaF0i3zy1vnbi+qcN5HxRfXb41b9bCfO872I= X-Gm-Gg: ASbGnct7PoWxmJrjKnRPFlAywVdYK8mJROXgjx/EO+LBKYiA61Q7HqZNOC0cTGp3DM7 YlsDYSnP3LoB1Cufqzr+h05Rx+KtGUUUukKXLoQKi+j9/1x1ofbXa+ArqQBC6ZDJXdSoU9/2An3 IgbW+Tk4yzi7SZBnMysaDlbjusGGmz9ZJyJao9CtoSgI7NAzLYcNSLKsKC1AnwuTbkyHmqtz6zK Tiq3uuJQIHVtbZ4QLO/N+abvBqykdZZXKnK8kE5OM/QFfOLVNSvyCJ0VGnfffpcN7JTLqxbPfJ3 iNxuc7Wq00QRi3AKbqaXmNv33fC8nR94UPSP1bzO2QW1WSFb X-Received: by 2002:a05:600c:c093:b0:456:2139:456c with SMTP id 5b1f17b1804b1-4562e3411a6mr46603125e9.11.1752748487291; Thu, 17 Jul 2025 03:34:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEA2tc4wmqGXxpZ0ZDxawBOJRC42k/brYOfXKOibkKFDpNhTpn+M2+/tAaV5wHhL9dVvvIzSA== X-Received: by 2002:a05:600c:c093:b0:456:2139:456c with SMTP id 5b1f17b1804b1-4562e3411a6mr46602865e9.11.1752748486769; Thu, 17 Jul 2025 03:34:46 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 2/3] qemu_tpm: Extract per-TPM functionality from qemuTPMDomainHasSharedStorage Date: Thu, 17 Jul 2025 12:34:42 +0200 Message-ID: X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VGKtp042JTCBF2H8SopOZFMLvnIN_GuNBODSnFIyo4E_1752748487 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: C7JWD6I3VZHNNDY3K2WQYF7MB2XTSTFY X-Message-ID-Hash: C7JWD6I3VZHNNDY3K2WQYF7MB2XTSTFY X-MailFrom: mkletzan@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 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: Martin Kletzander via Devel Reply-To: Martin Kletzander X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1752748540163116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander This way we can do the check for a particular TPM also elsewhere in the code, especially in places where we're dealing with only one TPM. The semantics is changed a little bit in a way that the function will check all the TPMs as opposed to stopping on the first one which is of the emulator type, but since a domain can currently only have one of these it was not an issue. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_tpm.c | 59 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 8c104ab1b303..855d732e60d0 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -205,6 +205,40 @@ qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm, } =20 =20 +static bool +qemuTPMHasSharedStorage(const virQEMUDriverConfig *cfg, + const virDomainTPMDef *tpm) +{ + switch (tpm->type) { + case VIR_DOMAIN_TPM_TYPE_EMULATOR: + return virFileIsSharedFS(tpm->data.emulator.source_path, + cfg->sharedFilesystems) =3D=3D 1; + case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + case VIR_DOMAIN_TPM_TYPE_EXTERNAL: + case VIR_DOMAIN_TPM_TYPE_LAST: + break; + } + + return false; +} + + +bool +qemuTPMDomainHasSharedStorage(virQEMUDriver *driver, + virDomainDef *def) +{ + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + size_t i; + + for (i =3D 0; i < def->ntpms; i++) { + if (qemuTPMHasSharedStorage(cfg, def->tpms[i])) + return true; + } + + return false; +} + + /** * qemuTPMEmulatorDeleteStorage: * @tpm: TPM definition @@ -1218,31 +1252,6 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, } =20 =20 -bool -qemuTPMDomainHasSharedStorage(virQEMUDriver *driver, - virDomainDef *def) -{ - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - size_t i; - - for (i =3D 0; i < def->ntpms; i++) { - virDomainTPMDef *tpm =3D def->tpms[i]; - - switch (tpm->type) { - case VIR_DOMAIN_TPM_TYPE_EMULATOR: - return virFileIsSharedFS(tpm->data.emulator.source_path, - cfg->sharedFilesystems) =3D=3D 1; - case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - case VIR_DOMAIN_TPM_TYPE_EXTERNAL: - case VIR_DOMAIN_TPM_TYPE_LAST: - break; - } - } - - return false; -} - - bool qemuTPMCanMigrateSharedStorage(virDomainDef *def) { --=20 2.50.1 From nobody Mon Sep 8 17:12:43 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=1752748517; cv=none; d=zohomail.com; s=zohoarc; b=T2lrnozgHceDgVHFVMXE+D5FPryYcfNtOo4orEZys9+rGrqLPD0GFOOlhbt3DBviQZMqZM9Zn+DeJLLyv0/zEPXiiDJBOGsMIvFq3KK7LCGLLEI/Eya5YXArsPDeKumn8+/g81lVJA5/0sOS9YEGYEgBK9leVGWmewCjqEPOeXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752748517; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=N3vNvrglQXRu30MIMXi/CUW3El7MaHiG3hAEHug7yRc=; b=evFKf7QHSILnW7mmc9ZMvJC6+gv+7gTv38kDjVKYySHX8DxSrYVux96BXFa+f2pGlyIQGbv3ttWI3/TaLdiMKgmZNy6fJvQ2xFfE4eazfKRZ+tBR45+H1JW8eAfl8Z1jRpmTWNMqCW7v8ZMyN8R2a282ueZmmn2wdO8i/u3Gu40= 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 1752748517412802.9901755618898; Thu, 17 Jul 2025 03:35:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1FDA311D1; Thu, 17 Jul 2025 06:35:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7EDCA11A7; Thu, 17 Jul 2025 06:34:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B5320110A; Thu, 17 Jul 2025 06:34:50 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 34A35D46 for ; Thu, 17 Jul 2025 06:34:50 -0400 (EDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65--xqhfoUVMbqA46ATdXTwrA-1; Thu, 17 Jul 2025 06:34:48 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-455e9daab1cso2265215e9.1 for ; Thu, 17 Jul 2025 03:34:48 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45634f4c3absm18759395e9.3.2025.07.17.03.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 03:34:46 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 6CA2FC3A28CE for ; Thu, 17 Jul 2025 12:34:45 +0200 (CEST) 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_PASS 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=1752748489; 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=MHxh6O+QLA81YKlA83xgcGkTklKE5qUMeiuJZ4/4qyk=; b=ebBGIQa0Ds2Dk7Ti3kEhwstMiOe2kTapWTTbt2Gq4S7FojdqwCH/mXwsq4rFk7dKCSBoiM A52vFoBmLaFH6XjMDn52LF3Pc5k1uf9uAoclUWZO5CPxIbNRp6LImtgxkj7rmWTlr5ydVy T/n41oJ32syi1XQX3eOv5DwFoPfP/hY= X-MC-Unique: -xqhfoUVMbqA46ATdXTwrA-1 X-Mimecast-MFC-AGG-ID: -xqhfoUVMbqA46ATdXTwrA_1752748487 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752748487; x=1753353287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MHxh6O+QLA81YKlA83xgcGkTklKE5qUMeiuJZ4/4qyk=; b=SOuidxJ55hDFgjBNK6eXforRCWdGXbbwtxoF4NYGdHIFy/eO0Dt9kW1yTo/2Iv/8F1 kmiXInfuJzzrtraqWrNSTUBxqjehS0lGOSh/MNmyIetG3+0cilxLUL1bG9igdtGS3A3+ Ep/CqfPHdMbCTnPfhFBlissXXe0q8ONY2SUmQISVCTOTcE3CZcOm2o7jOSCuIuPuF6yO EL5/dgvSmUC6CEyz9+jBeGn44vLLdzFMqwLfu0u+IoGxfevR0Sk6lCHmhDTm5XhOXzVw Q7V61Cv9YekeOAmTXn+kvb74Bzcjok7KDVbGu7FGH05hLibIJ3mGx89KAQbWaC5IKR1V yA5g== X-Gm-Message-State: AOJu0Yw63ePRvPr3aeOQNbkjIHZz/rESwDUjl15okg7067e8gJYMJlXL A18CF04DZCuzTtAKpiA85mc+EkvSymP8ldJ5VimBTyBTG6caVfE6SfwV0OBmuSImXB12y3zAyXD Zlg5/+UViu/y6EtMYDc/hCEDlncKSzALrcMDAlal9/nCIqJCALtBwNTu3TSa+ACuaxd9qVEmFmY rG5sBb43gl8zAmtXrQd02gyKnhMzoNuYXDolkDVP5sUeU= X-Gm-Gg: ASbGncs3ChBXmfqkiunsjaU0ZXvLwMqya+HKz7HNrBKbNjohTlcnBFQFtDsamJX7d8J 326QKvAGozIxfvFoJvc2Vyc2zrr1xuJJUlLoc7B4Te3j5sAjYG57E95uwwDB8QUZKB9Zpe8K01d /+ajkNM8gb8+Z2qMWlveKvNGTZS5ex8zznQ6G1/hrGCrLtvl9ntK8tge8DIIAftiDxqwf5mb8ra /s4ieBQ58dRQRGZMDn3CtJxu0IsnmjTZynTATqUvaBkufWvqxUEIVe14F8rG+PxRkRTyPhVKLmZ iEnH/TsUTl4Wt8sVOKw6goaGnwxAkxcw1taFIOZ3iFVkxNVD X-Received: by 2002:a05:600c:83cc:b0:441:a715:664a with SMTP id 5b1f17b1804b1-4562e276516mr59673355e9.20.1752748487008; Thu, 17 Jul 2025 03:34:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF9raHcIePPUDpdmgk75hRGFcdgoUU9axQYJdPoRMTUkQ8bvr8+2W1NC8EVYe++3GAWyc7VuQ== X-Received: by 2002:a05:600c:83cc:b0:441:a715:664a with SMTP id 5b1f17b1804b1-4562e276516mr59673015e9.20.1752748486482; Thu, 17 Jul 2025 03:34:46 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 3/3] qemu_tpm: Only warn about missing locking feature on shared filesystems Date: Thu, 17 Jul 2025 12:34:43 +0200 Message-ID: X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: O8sXTS3Tjza1kO-_us3_x00GG_sl_hUJO1xoG3au1Ic_1752748487 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: C6MLDTXTUCC7TE2RMCKAKNSQT326HA74 X-Message-ID-Hash: C6MLDTXTUCC7TE2RMCKAKNSQT326HA74 X-MailFrom: mkletzan@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 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: Martin Kletzander via Devel Reply-To: Martin Kletzander X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1752748521777116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander The warning pollutes the logs and might give a bad impression on someone reading them even though the locking is not always needed. This way we at least limit the logging in unnecessary cases. Resolves: https://issues.redhat.com/browse/RHEL-80155 Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_tpm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 855d732e60d0..cdbd6e3993b2 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -660,12 +660,16 @@ qemuTPMVirCommandSwtpmAddEncryption(virCommand *cmd, =20 static void qemuTPMVirCommandSwtpmAddTPMState(virCommand *cmd, - const virDomainTPMEmulatorDef *emulator) + const virDomainTPMEmulatorDef *emulator, + const virDomainTPMDef *tpmDef, + const virQEMUDriverConfig *cfg) { const char *lock =3D ",lock"; =20 if (!virTPMSwtpmCapsGet(VIR_TPM_SWTPM_FEATURE_TPMSTATE_OPT_LOCK)) { - VIR_WARN("This swtpm version doesn't support explicit locking"); + if (qemuTPMHasSharedStorage(cfg, tpmDef)) + VIR_WARN("This swtpm version doesn't support explicit locking"= ); + lock =3D ""; } =20 @@ -721,7 +725,7 @@ qemuTPMEmulatorUpdateProfileName(virDomainTPMEmulatorDe= f *emulator, =20 virCommandAddArgList(cmd, "socket", "--print-info", "0x20", "--tpm2", = NULL); =20 - qemuTPMVirCommandSwtpmAddTPMState(cmd, emulator); + qemuTPMVirCommandSwtpmAddTPMState(cmd, emulator, persistentTPMDef, cfg= ); =20 if (qemuTPMVirCommandSwtpmAddEncryption(cmd, emulator, swtpm) < 0) return -1; @@ -848,7 +852,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm, virCommandAddArgFormat(cmd, "type=3Dunixio,path=3D%s,mode=3D0600", tpm->data.emulator.source->data.nix.path); =20 - qemuTPMVirCommandSwtpmAddTPMState(cmd, &tpm->data.emulator); + qemuTPMVirCommandSwtpmAddTPMState(cmd, &tpm->data.emulator, persistent= TPMDef, cfg); =20 virCommandAddArg(cmd, "--log"); if (tpm->data.emulator.debug !=3D 0) --=20 2.50.1