From nobody Tue Sep 9 19:03:25 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 --- 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