From nobody Thu May 2 06:19:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659436153; cv=none; d=zohomail.com; s=zohoarc; b=G3UOFBDa+DYll1XjhM0mpI17X2JT7AUJ8QTJhzYJHJnvGP9Q11CJMXoZ49uLqqaezw/oR3kfBsn0dalVQ63g2OkzmxGqSaou9vjoRntzJjoe+zNZ2HTaM5L8SZYP+TfOJychYzx1nFZ8aGH/Rj/2PtsDrAeMMec6AgY7uzxtOGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659436153; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k+POReWAphDmdwkv69CSUJrGTwmOOfH9abtt2rI0jc8=; b=PG3SKf+i//HoIIVum+0FmUdacdJo+ieyQoi8m2v/iVesDSQhn67jIxEOwSUHzcKSuQk1+i1WUg6guW8r1WjDnYfq8MkqKrq/a4BhVoXWU3+JtXglxH+v0fRx/eHazp4XGPfdWBUeW8LZcepxp3XPvbS79Gfavr296wMZ3tRwLUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1659436152997223.76826782699356; Tue, 2 Aug 2022 03:29:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-132-3DANOWQhNn-dsRks65y6vw-1; Tue, 02 Aug 2022 06:29:05 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DDC01C01B2C; Tue, 2 Aug 2022 10:29:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1081F2026D4C; Tue, 2 Aug 2022 10:28:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 726FE1946A53; Tue, 2 Aug 2022 10:28:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 01C5D1946A47 for ; Tue, 2 Aug 2022 10:28:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EC01A2026D07; Tue, 2 Aug 2022 10:27:59 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 975362026D4C for ; Tue, 2 Aug 2022 10:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659436152; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=k+POReWAphDmdwkv69CSUJrGTwmOOfH9abtt2rI0jc8=; b=ZfKnSvdeZ5V/WDLPr76QOdstrjToAIX9Xl+WNBfufjndtYsexsKFjvKfin/mmy46XLHp7j TLZHoL5nMzvqPKVjX+Qs8Y+KVBfYISJjNFs2RifkVOK6SGhl4V33iJpyFN0Yp2YYenKZrB VDZmeSthbcX+lxgVgl74XddwdulbWfg= X-MC-Unique: 3DANOWQhNn-dsRks65y6vw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/4] src: Export virDomainTPMVersion enum conversion helpers Date: Tue, 2 Aug 2022 12:27:54 +0200 Message-Id: <321bb0625670c37dba922662330c056ca57bfe5a.1659435917.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659436153920100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The virDomainTPMVersion enum is declared in domain_conf.h among with its TypeFromString() and TypeToString() helpers (which are then implemented in domain_conf.c). However, neither of these helpers is exposed in libvirt_private.syms which makes it impossible for other modules to use. Signed-off-by: Michal Privoznik Reviewed-by: Kristina Hanicova --- src/libvirt_private.syms | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6a5c5600df..797598d53b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -672,6 +672,8 @@ virDomainTPMModelTypeFromString; virDomainTPMModelTypeToString; virDomainTPMPcrBankTypeFromString; virDomainTPMPcrBankTypeToString; +virDomainTPMVersionTypeFromString; +virDomainTPMVersionTypeToString; virDomainUSBDeviceDefForeach; virDomainVideoDefaultRAM; virDomainVideoDefClear; --=20 2.35.1 From nobody Thu May 2 06:19:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659436110; cv=none; d=zohomail.com; s=zohoarc; b=PHpSrIqpnkiq9ncTVqKpe/QI6Zk39EiTF+3BIDdaZcNAK885pFSRSFi/CbdF/ukDLDmm/u60dEfNLb28qMOjPmZdqTydyK83a3GFuaQZ1Q+cUrJZV2w399Tqo8NY5nQeLeKp1FDsM6+YAdWEhn0e6+5rR4hxXfRZBtuatQQH98s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659436110; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f4VCA8wYCfYLkNBAcokALViCiYa+W/rYL3tmeNJQ/3Y=; b=b7r8qqZ82HjPRxicwHBA2jEuIIghxn1oup7UPY9MQkm5tfmOAg/qtBPOqTKoO1D0QWdRwdSu0cNdmNptx+cBaxPwDdAUSYqNNHZHwba/2L3B7XSGbz3xBZufWQcvUEii6o9RMeE/u9PUEJktwN2WuCNEflMXgZ1NpBQaaUuByuw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1659436110388905.1085516987306; Tue, 2 Aug 2022 03:28:30 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-128-bKkL70wWMbGKK-lRkhXwPg-1; Tue, 02 Aug 2022 06:28:27 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D339805B9A; Tue, 2 Aug 2022 10:28:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2B0C401E5C; Tue, 2 Aug 2022 10:28:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A0C8C1946A79; Tue, 2 Aug 2022 10:28:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DB58A1946A70 for ; Tue, 2 Aug 2022 10:28:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B9AC4202699A; Tue, 2 Aug 2022 10:28:00 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EA312026D4C for ; Tue, 2 Aug 2022 10:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659436109; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=f4VCA8wYCfYLkNBAcokALViCiYa+W/rYL3tmeNJQ/3Y=; b=N+fojDROMDPcJlMHb4n+f0linq2PxljtyZFUUYSpwdfegKeussugZy6OHtihkeMhrd4jUg XWB7s/SfX4Ucie42OrOegJZVLg373ejhGVjNi8su11qCKf2/s8SmJzapKensQlHKI849uK uetrAU6zhKiyQ3ZwH+rJ5xm5TbLV9dE= X-MC-Unique: bKkL70wWMbGKK-lRkhXwPg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/4] testutilsqemu: Fake TPM versions Date: Tue, 2 Aug 2022 12:27:55 +0200 Message-Id: <00121bcb2e6619078fd387c47e70f325525e5ee4.1659435917.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659436111175100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Because of v8.5.0-rc1~25 we are already faking TPM support for domaincaps. Might as well fake supported TPM versions. The swtpm binary supports both TPM versions since its first release, but pretend it isn't the case. For QEMU-5.2 and older pretend only TPM-1.2 is available, QEMU-6.* has both TPM-1.2 and TPM-2.0 and QEMU-7.0 and newer has only TPM-2.0 available. This way, domaincaps are more dispersed. Signed-off-by: Michal Privoznik Reviewed-by: Kristina Hanicova --- tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 3 +++ .../domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 3 +++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 3 +++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 +++ .../domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 3 +++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 3 +++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 4 ++++ .../domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 4 ++++ .../domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 4 ++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 +++ .../domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 3 +++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 3 +++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 +++ tests/domaincapstest.c | 17 ++++++++++++++++- tests/testutilsqemu.c | 13 +++++++++++-- tests/testutilsqemu.h | 3 +++ 54 files changed, 197 insertions(+), 3 deletions(-) diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_3.1.0-q35.x86_64.xml index c4277c53a1..0cbfd675fa 100644 --- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml @@ -198,6 +198,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_3.1.0-tcg.x86_64.xml index 2a65cb0ad9..823af73010 100644 --- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml @@ -217,6 +217,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_3.1.0.x86_64.xml index 6e3ddda356..0b1f60e89d 100644 --- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml @@ -198,6 +198,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_4.0.0-q35.x86_64.xml index 8f3911b4b3..4cfa127b7a 100644 --- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml @@ -198,6 +198,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_4.0.0-tcg.x86_64.xml index a4dc7bafc9..06baee7f68 100644 --- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml @@ -217,6 +217,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_4.0.0.x86_64.xml index 24e732d9c3..6d6e9bbc3f 100644 --- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml @@ -198,6 +198,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_4.1.0-q35.x86_64.xml index 3ee7feea48..1b598b6be1 100644 --- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml @@ -204,6 +204,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_4.1.0-tcg.x86_64.xml index b20c02cb68..ca07b7ae82 100644 --- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml @@ -220,6 +220,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_4.1.0.x86_64.xml index 0f1d398e2c..11bf14708c 100644 --- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml @@ -204,6 +204,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-q35.x86_64.xml index c8a77cdd41..0ec4c570ac 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -212,6 +212,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-tcg.x86_64.xml index d0ee3f7b7a..4e0cb08b72 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -227,6 +227,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_4.2.0.ppc64.xml index 4c3a2c6d98..e21ba9372b 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -132,6 +132,9 @@ spapr-tpm-proxy + + 1.2 + diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_4.2.0.x86_64.xml index 6578fd04b6..d8793bb38a 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -212,6 +212,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-q35.x86_64.xml index 8a6797c2f1..036e446c64 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -214,6 +214,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-tcg.x86_64.xml index d277c96426..4df4e86cf1 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -229,6 +229,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.0.0-virt.aarch64.xml index f8cea230d9..bb8500baa6 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -173,6 +173,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincaps= data/qemu_5.0.0.aarch64.xml index ab72b7ffeb..e7227d092f 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -171,6 +171,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.0.0.ppc64.xml index d196676b14..cac329fd08 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -138,6 +138,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.0.0.x86_64.xml index 51ca1d98e0..e901d12918 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -214,6 +214,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-q35.x86_64.xml index 3468fb2e72..df1572c901 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -215,6 +215,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-tcg.x86_64.xml index 4f1ffbb2ba..3a6dc7b5fc 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -229,6 +229,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.1.0.x86_64.xml index 8ff49c7899..e0e8e0ed12 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -215,6 +215,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-q35.x86_64.xml index 2301a475eb..6a49f568be 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -215,6 +215,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-tcg.x86_64.xml index 6cff0f815e..f41f47c346 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -229,6 +229,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.2.0-virt.aarch64.xml index a863a6052d..dfd792c031 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -173,6 +173,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincaps= data/qemu_5.2.0.aarch64.xml index ab72b7ffeb..e7227d092f 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -171,6 +171,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.2.0.ppc64.xml index b2c0577be9..88e4837ec3 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -138,6 +138,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.2.0.x86_64.xml index 41a54985d7..0a6f72df7e 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -215,6 +215,9 @@ passthrough emulator + + 1.2 + diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-q35.x86_64.xml index 4595e70f61..40df34edf0 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -216,6 +216,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-tcg.x86_64.xml index 65f4459bcb..e563b0cb59 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -230,6 +230,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.0.0-virt.aarch64.xml index 61eab9de0e..958c40437f 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -174,6 +174,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincaps= data/qemu_6.0.0.aarch64.xml index fa722b5fd3..4164bf49f7 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -172,6 +172,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.0.0.x86_64.xml index a6fa374211..eb60a2105f 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -216,6 +216,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-q35.x86_64.xml index f4d0fcf673..0480a086c6 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -217,6 +217,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-tcg.x86_64.xml index 40bc875e3c..7baecb0c73 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -230,6 +230,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.1.0.x86_64.xml index 67fc449f5d..9cbe93ad46 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -217,6 +217,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-q35.x86_64.xml index 9d68c0a404..07b951b81f 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -217,6 +217,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-tcg.x86_64.xml index a439dda190..367e656b31 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -231,6 +231,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.2.0-virt.aarch64.xml index f6045623f5..99c0fc03fd 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -176,6 +176,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincaps= data/qemu_6.2.0.aarch64.xml index 35e18adcd5..8e04508694 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -174,6 +174,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_6.2.0.ppc64.xml index b07072778b..0bbe501383 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -136,6 +136,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.2.0.x86_64.xml index 0f89790b60..f363cf1b79 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -217,6 +217,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-q35.x86_64.xml index 4e6ff06125..136dadaeb4 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -219,6 +219,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-tcg.x86_64.xml index ed80a7892f..c684759356 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -233,6 +233,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_7.0.0-virt.aarch64.xml index 7a8cb9f113..1d6f29db9f 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -176,6 +176,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincaps= data/qemu_7.0.0.aarch64.xml index d48c87dc3a..73097470f8 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -174,6 +174,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.0.0.ppc64.xml index ec171bcdd9..7765c941c5 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -138,6 +138,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.0.0.x86_64.xml index a20395c6d4..0f9a65ef1b 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -219,6 +219,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-q35.x86_64.xml index 4e96c5104a..30082712f4 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -218,6 +218,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-tcg.x86_64.xml index 46542c8b5b..bcca02f0a4 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -231,6 +231,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.1.0.x86_64.xml index 02b43e318f..f377b8e3a9 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -218,6 +218,9 @@ passthrough emulator + + 2.0 + diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 3b8216a8f6..b4cb1894c2 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -252,6 +252,7 @@ doTestQemuInternal(const char *version, g_autofree char *name =3D NULL; g_autofree char *capsName =3D NULL; g_autofree char *emulator =3D NULL; + int rc; =20 name =3D g_strdup_printf("qemu_%s%s%s%s.%s", version, @@ -274,7 +275,21 @@ doTestQemuInternal(const char *version, }; VIR_WARNINGS_RESET =20 - if (virTestRun(name, test_virDomainCapsFormat, &data) < 0) + if (STRPREFIX(version, "3.") || + STRPREFIX(version, "4.") || + STRPREFIX(version, "5.")) { + g_setenv(TEST_TPM_ENV_VAR, TPM_VER_1_2, true); + } else if (STRPREFIX(version, "6.")) { + g_setenv(TEST_TPM_ENV_VAR, TPM_VER_1_2 TPM_VER_2_0, true); + } else { + g_setenv(TEST_TPM_ENV_VAR, TPM_VER_2_0, true); + } + + rc =3D virTestRun(name, test_virDomainCapsFormat, &data); + + g_unsetenv(TEST_TPM_ENV_VAR); + + if (rc < 0) return -1; =20 return 0; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 00dd9871d1..6d3decdc16 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -146,16 +146,25 @@ bool virTPMHasSwtpm(void) } =20 =20 + bool virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap) { + const char *tpmver =3D getenv(TEST_TPM_ENV_VAR); + switch (cap) { + case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2: + if (!tpmver || (tpmver && strstr(tpmver, TPM_VER_1_2))) + return true; + break; + case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0: + if (!tpmver || (tpmver && strstr(tpmver, TPM_VER_2_0))) + return true; + break; case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD: case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES: case VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT: case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_RECONFIGURE_PCR_BANKS: - case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2: - case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0: case VIR_TPM_SWTPM_SETUP_FEATURE_LAST: break; } diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 7ce4c4ad8d..943958d02a 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -25,6 +25,9 @@ # include "qemu/qemu_conf.h" =20 # define TEST_QEMU_CAPS_PATH abs_srcdir "/qemucapabilitiesdata" +# define TEST_TPM_ENV_VAR "VIR_TEST_MOCK_FAKE_TPM_VERSION" +# define TPM_VER_1_2 "1.2" +# define TPM_VER_2_0 "2.0" =20 enum { GIC_NONE =3D 0, --=20 2.35.1 From nobody Thu May 2 06:19:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659436110; cv=none; d=zohomail.com; s=zohoarc; b=KiA8HzM4AJs3BHHRYfSPsh2fBdiJnbgcrc/WPrjsCOenprid2Z96FDQjJ8+jWvnxbenRz4D9FdQ1MsKjuq0e1UckQRz3ad8f4XYWIfxwXAlQgvTXfS+P7v916Afs1IVcVnM3tmId7h0Mv5jkWAsTkq3TMzIf9RkqiN1WOCcP+sk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659436110; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5P8FA6tHZL181TMu/5+i6kym1sIEO4t2vHRj8AKa3WM=; b=gjJnyRyzT1i5jtoozbhP4fANQp/JSaijfysGyDAtqyeX3FBcFujSW+3Sm0SypCAzxVKZjrMS2LqN9qHm86E6qa12EwLQ1kZWw2J/j4kvZn+Azj+0y1vLwbioBJacfa82Rupb7mTz5msve4jDly42IZX1V4GhrbeTLOv6bjYALYQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1659436110834861.797031704079; Tue, 2 Aug 2022 03:28:30 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-544-DIATw77lNRmwIIfTzcgOjg-1; Tue, 02 Aug 2022 06:28:27 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9558B1019C90; Tue, 2 Aug 2022 10:28:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82AA7401E5C; Tue, 2 Aug 2022 10:28:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 37D8D1934F22; Tue, 2 Aug 2022 10:28:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8A3741946A7B for ; Tue, 2 Aug 2022 10:28:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4F9852026D07; Tue, 2 Aug 2022 10:28:01 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id F00BD2026D4C for ; Tue, 2 Aug 2022 10:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659436109; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5P8FA6tHZL181TMu/5+i6kym1sIEO4t2vHRj8AKa3WM=; b=ZDsajowySOwYdXOVPtjDGleuM04Tf9ADlPmnm5ixnJFTLQyqM2q3P2yaotG8u+3WsIeWPD wRtT3BGa5an9sN6VC1cZmKbQl44xiAHI9qNYqp3PvegijaPItm1iEV9ESVHIeRU3id814h UtzzP0cyr/RTo1GwCp5nfPuBTMUMwhk= X-MC-Unique: DIATw77lNRmwIIfTzcgOjg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/4] qemu_validate: Validate TPM version Date: Tue, 2 Aug 2022 12:27:56 +0200 Message-Id: <6c038c06aff02783f195e04cd84c8a2e6cc6df2c.1659435917.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659436111068100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Supported TPM versions are reported in domain capabilities. These are used already to validate TPM type and model, but not TPM version. This is suboptimal, because otherwise we leave users to meet the error when starting a guest and libvirt spawns swtpm binary which in turn reports an error. Signed-off-by: Michal Privoznik Reviewed-by: Kristina Hanicova --- src/qemu/qemu_validate.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 48bd40db9f..3b95b1feec 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4794,8 +4794,19 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm, { virDomainCapsDeviceTPM tpmCaps =3D { 0 }; =20 + virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, &tpmCaps); + if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) { - switch (tpm->data.emulator.version) { + const virDomainTPMVersion version =3D tpm->data.emulator.version; + + if (!VIR_DOMAIN_CAPS_ENUM_IS_SET(tpmCaps.backendVersion, version))= { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("TPM version '%s' is not supported"), + virDomainTPMVersionTypeToString(version)); + return -1; + } + + switch (version) { case VIR_DOMAIN_TPM_VERSION_1_2: /* TPM 1.2 + CRB do not work */ if (tpm->model =3D=3D VIR_DOMAIN_TPM_MODEL_CRB) { @@ -4824,8 +4835,6 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm, } } =20 - virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, &tpmCaps); - if (!VIR_DOMAIN_CAPS_ENUM_IS_SET(tpmCaps.backendModel, tpm->type)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("The QEMU executable %s does not support TPM " --=20 2.35.1 From nobody Thu May 2 06:19:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659436114; cv=none; d=zohomail.com; s=zohoarc; b=MV3CtREn1L1wJrv4KcX+RDUT5KOMfK/pw2oNoyjlumr0lseZ1exgaLd107HN6rpBmo0RZkqZUVjbedtNzfWYORIDr7yxZIB9ogRqsg1YeDAvP84V7xR8qCtSL15aG47smiJCPMPTzYbr7oAAJLjcjNEfQityH3FOWPDRIyv8+5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659436114; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bIyUw+QuSO9mQRO2E9VVq8rvCsTyaCP66lw54Xr/3vI=; b=TVcAWbnMuYwHwNcvXZ7qT9K0iXbkqmRgOgCi2NdGg0L8zoa5NyN9IFwYi8zg1G16X6pyBIUrABPZtfxp8iNY+4pIj2tUOrAcgVjolP8jDceK2U+K9CT5JiuLiMFT4bnng/1PjuBkTAFe0fO1D7N2BsMvvIngFXFn0ejT+L57KoM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1659436114412964.8448308198788; Tue, 2 Aug 2022 03:28:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-yQcV4s34PWaPD8pCYHP6Iw-1; Tue, 02 Aug 2022 06:28:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3F5FB3C0D190; Tue, 2 Aug 2022 10:28:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D74E18ECC; Tue, 2 Aug 2022 10:28:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C86DD1945DB1; Tue, 2 Aug 2022 10:28:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 13ECB1945D9D for ; Tue, 2 Aug 2022 10:28:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D9E842026D07; Tue, 2 Aug 2022 10:28:01 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 864102026D4C for ; Tue, 2 Aug 2022 10:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659436112; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bIyUw+QuSO9mQRO2E9VVq8rvCsTyaCP66lw54Xr/3vI=; b=Knxls0Z5Whd21uCXRPHurF04Cg7ltdnLFlUwBBPr596CdpL/OqC7iXGjZ5MksziZh9mn2q gMgdwtIGRVkEG632H0+kMa5WTv0oK9LxSxhhwqXZoW/zQNXDTvT/XGlrnYpZU6bCcHD4ku ifrhqeo4HqSc3Y/DnMw5Xf0n60r5i8Y= X-MC-Unique: yQcV4s34PWaPD8pCYHP6Iw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/4] qemuxml2argvtest: Add negative cases for TPM version Date: Tue, 2 Aug 2022 12:27:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659436115074100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that we have all the machinery needed, we can introduce two simple test cases: 1) only TPM 1.2 is supported, but TPM 2.0 was requested in domain XML, 2) only TPM 2.0 is supported, but TPM 1.2 was requested in domain XML. Signed-off-by: Michal Privoznik Reviewed-by: Kristina Hanicova --- tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.err | 1 + tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.err | 1 + tests/qemuxml2argvtest.c | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.= err create mode 100644 tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.err b/t= ests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.err new file mode 100644 index 0000000000..8c16024791 --- /dev/null +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: TPM version '2.0' is not supported diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.err b/tests/= qemuxml2argvdata/tpm-emulator.x86_64-latest.err new file mode 100644 index 0000000000..172343d267 --- /dev/null +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: TPM version '1.2' is not supported diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 05537d9e96..bebe4f08a3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2564,6 +2564,12 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64"); DO_TEST_PARSE_ERROR_NOCAPS("aarch64-tpm-wrong-model"); =20 + g_setenv(TEST_TPM_ENV_VAR, TPM_VER_2_0, true); + DO_TEST_CAPS_LATEST_PARSE_ERROR("tpm-emulator"); + g_setenv(TEST_TPM_ENV_VAR, TPM_VER_1_2, true); + DO_TEST_CAPS_LATEST_PARSE_ERROR("tpm-emulator-tpm2"); + unsetenv(TEST_TPM_ENV_VAR); + DO_TEST_PARSE_ERROR_NOCAPS("pci-domain-invalid"); DO_TEST_PARSE_ERROR_NOCAPS("pci-bus-invalid"); DO_TEST_PARSE_ERROR_NOCAPS("pci-slot-invalid"); --=20 2.35.1