From nobody Mon Sep 8 17:03:33 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=1752844148; cv=none; d=zohomail.com; s=zohoarc; b=KPGaWvwbfq5wM9ogL3Wt6GgD3/ctiktYpBZ6pYb/v8krfosvdFtJpjkL5wnuGYlj+pGbjBAi9uB/beuJhC6+LXjTylaYAXUewE3a9KW8krwU8aHY7YXedY1VUcdDFc1TzFvtdxZJSpeI1ItzHq/2SzoMLPZV3dUmazQm9YkxvMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752844148; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id; bh=/uRBVSpnOAlGm84CzSHWM7GQ0cEDUOspNf8dAiQ+oAI=; b=HdoWbqvwD5GVbRoro9nrpGPg0g1SaDiux1odACNqbx/nEgN7FAF6razd3naNcVo9DJmH1Zr0hlqHJD56p0O6005KhqLOq2ZBdGJpHUJWYAZlBTvQHjTswtv4G4jeKQ3rvgxq1X4qyR7fpEKVidTpwnR50sn3qA1vG5WkYK15Ego= 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 1752844148673151.68591580598024; Fri, 18 Jul 2025 06:09:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A5AFA12E3; Fri, 18 Jul 2025 09:09:07 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0E90C1274; Fri, 18 Jul 2025 09:08:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DC28D11CB; Fri, 18 Jul 2025 09:08:46 -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 5A7771256 for ; Fri, 18 Jul 2025 09:08:46 -0400 (EDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-6LELNu6MP7KPavXBXXf1Rw-1; Fri, 18 Jul 2025 09:08:44 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a4fabcafecso1030080f8f.0 for ; Fri, 18 Jul 2025 06:08:44 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4563b5ac086sm19976145e9.7.2025.07.18.06.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 06:08:42 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id E3EDCC3FBF12; Fri, 18 Jul 2025 15:08:41 +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=1752844126; 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; bh=8iIBtzrDIclk6m0hWDgRzw29LO9zsW6yu03XOZ1qWPo=; b=fPcCcB+vStz6qEj4ni6KF83Qg6rWjGKoOPdHpnN7TN+O4T416jV7Jy4HzdVuR35wP15ryz NY3j2zKZfb06UeI3BfTKBWmz47KRayUCUFV768pcK5kBELg4E8XRDEG5aeAsYREwlE8slg 8IB8LEzOcmpFZ+dZXLuhANLNTVFHqbI= X-MC-Unique: 6LELNu6MP7KPavXBXXf1Rw-1 X-Mimecast-MFC-AGG-ID: 6LELNu6MP7KPavXBXXf1Rw_1752844124 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752844123; x=1753448923; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8iIBtzrDIclk6m0hWDgRzw29LO9zsW6yu03XOZ1qWPo=; b=MbMkfqlKXgfr5Vgw5BrgyYv+IRlBVcx6CDBCsfJxPpl8r3LEkvs14cCAmR3bkIzF6F bNjWEJT0oT0sGi5F4KmyaMlDKXHW4nZ7MYrUefPV8/1NmeiyFLJTTb36hX0ARwuRmT7i YSkPcdOetns4DZ6gYcRNISVk3PnBKXj+gS90XuXvsPsbloelmQyaAJOyIVBM1MyIkJRe hJPn/ykbVBA6Qvb2cU76wgRlIsBWQuL1TuyWogjNT/yf5z9teU7Re85SmZmWykuM1AdS tM0LeIDpOtg771Z6j90RD3DIg99F750b477okCWSiq/rKq1Dnnj23Vr/VLwKL4IePyAQ yeaA== X-Gm-Message-State: AOJu0YzOhNG9af3XFtpon6FI05JCpnqiRs6cHYjRDQNBO8Cb7wzVjyTj +fg81JesoJ+xVZBDnBkf9USSpl34uIyF78sOl0NN3YnjUvtDSWEIipxSOkGhfMm60w7MdLWtipz FKvoGw3ki28UvMtozmsE4VXaiDvu6j+OZYbzRQxsnKdYQmGCz9KO4AAK63Yf6XIobtz4iYjCB1S 1Jckqtc0qzU08N7RO9iy1UHUF/1GcunI2RzGRM2huUJY4= X-Gm-Gg: ASbGncs2kHXW/p+9j1CCce+1xdSXOmzGVeE8BbLJ/Tg5eGaFXt68/gnNxttZ/8i0TxC u6fTRdiBVhDudH79ifrUaP7nAYOW0fqQPdIbaqY2lo2l3ArBvWEivcTAsBVEAI5EdqrNhv/0MrU /hbHhH9HUQUMXzAq/D1wR9N6awn9znEBGz59vWMtKjDQJO/3MkLRHJWqG0UDikpDPDY8nY+58Fb xXpe1N6kScCXo9zgBCTKmrielikvtfiP2egQoX4/qlnM8VSblNFCZj75FzA0jdHJmqZT/ATQJ+N 3NXidgwXHRUeeCF38jDq3QfBwF91VLO8q/oZ4YJwymEWufJb X-Received: by 2002:a05:6000:288f:b0:3b6:489:b7e5 with SMTP id ffacd0b85a97d-3b60ddc5a47mr8351587f8f.49.1752844123428; Fri, 18 Jul 2025 06:08:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHS4MOnRfUVLGXTcvxgfWXqOEag0VB+n7WntPaE+kFMSeRv9D+HxfrbqVd0sD4AM6paCaWmfA== X-Received: by 2002:a05:6000:288f:b0:3b6:489:b7e5 with SMTP id ffacd0b85a97d-3b60ddc5a47mr8351550f8f.49.1752844122777; Fri, 18 Jul 2025 06:08:42 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH] qemu_tpm: Do not use persistent definition during pre-start checks Date: Fri, 18 Jul 2025 15:08:38 +0200 Message-ID: X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Jm84Fo_WTMQqyUfB6cajViqihzaJDLa87hZe-GIYknw_1752844124 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZCA7LFMVPYQZA2RRQ2AOYW7YMJEFXE6Z X-Message-ID-Hash: ZCA7LFMVPYQZA2RRQ2AOYW7YMJEFXE6Z 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 CC: Pavel Hrdina 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: 1752844149813116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander Commit 3451987fca7c used the persistent TPM Definition in both calls to qemuTPMVirCommandSwtpmAddTPMState() but in one of the two cases it might've been NULL and what's more, it is not the right definition which should've been used. Change that to @tpm which is the current definition. The other call does not have access to the current definition and is only called during updating the profile. But for the sake of fewer future mistakes, keep the other one as is because there is no issue with calling it that way and adding logic that just skips the extra check on NULL could mistake someone in the future. Signed-off-by: Martin Kletzander Reviewed-by: Pavel Hrdina --- src/qemu/qemu_tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 5cb678df0eee..4c9445d72c39 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -852,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, persistent= TPMDef, cfg); + qemuTPMVirCommandSwtpmAddTPMState(cmd, &tpm->data.emulator, tpm, cfg); =20 virCommandAddArg(cmd, "--log"); if (tpm->data.emulator.debug !=3D 0) --=20 2.50.1