From nobody Mon Feb 9 01:47:24 2026 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=1659080584; cv=none; d=zohomail.com; s=zohoarc; b=IuD2exCrefOr1JBNXA56mtCfWNHk9FMgne0KNfEEpEUQl3SOy8Z5Ym9xT+f3EhV7zOFjHb9r7mvD2pWVqYX4oUMzlhj4xAUE0rRYHSeXggFCzXPkwaNVHisyjSzG1Qzs7EwN01fnaPflm+1+ux53xu1VkqWFiwEP8MX9n1swJCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659080584; 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=1brMM3yiptN/SVg2qoUh3quJFrKEs4zpTk4ZrS+6Tko=; b=EdHt+91EWGlBAHuTUzGuCxZMpL7f/bPu8B3BTvjtfm6tVBHLRTa62FSHyY1UWdS6zlQJKkj4hvyZ6s5Zi8gVg4ybf0JU/nCJYY37sq3OQdpt3h3usozWVj/WwhAcPnG0GA4DGIBS68ZPhNuDzWytr3sdwKJrkez6X1sVQieWx/w= 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 1659080584826328.36978051060964; Fri, 29 Jul 2022 00:43:04 -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-259-sOpllnKXNZaJEYjE6ROYGg-1; Fri, 29 Jul 2022 03:42:22 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 28053801755; Fri, 29 Jul 2022 07:42:19 +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 113491415124; Fri, 29 Jul 2022 07:42: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 E3339193211F; Fri, 29 Jul 2022 07:42:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 950BF193212F for ; Fri, 29 Jul 2022 07:42:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8282F40315E; Fri, 29 Jul 2022 07:42:16 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBEBE492C3B for ; Fri, 29 Jul 2022 07:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659080583; 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=1brMM3yiptN/SVg2qoUh3quJFrKEs4zpTk4ZrS+6Tko=; b=EK9sUKPI8IVQtcI1FrIlV1y5L16ly9PFmWpSAPOSzciGokkjIrjDNjuZz4ouKLKdnBJVGF 5O1vQ5Ybvl9n8KjIr9ar8xhV+7M0H1IzZX+IcQJwIoHBj+b6VtTrUypj1yFZJ7Z3Vrvnsi aaafjNQ6v3MmQdYWqHukhRIw/vQ5Z0U= X-MC-Unique: sOpllnKXNZaJEYjE6ROYGg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] testutilsqemu: Fake TPM versions Date: Fri, 29 Jul 2022 09:42:13 +0200 Message-Id: <1833c56185a1c5d2c806c6f0268fbc4ee00d3b1f.1659080395.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1659080585089100001 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. Signed-off-by: Michal Privoznik Reviewed-by: Andrea Bolognani --- tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 4 ++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 4 ++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 4 ++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 4 ++++ tests/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 ++++ tests/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 | 4 ++++ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 4 ++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 4 ++++ tests/testutilsqemu.c | 5 +++-- 52 files changed, 207 insertions(+), 2 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..0d4bccdc68 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..5fffa7cc5b 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..8de1a65cd7 100644 --- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml @@ -198,6 +198,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..e6c0a18711 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..b7a5eb35af 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..3d12aef002 100644 --- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml @@ -198,6 +198,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..212ea2a288 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..2fb0639f70 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..be001262ec 100644 --- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml @@ -204,6 +204,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..a4ddb1de4d 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..59efd9424c 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,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_4.2.0.ppc64.xml index 4c3a2c6d98..ed8866cfe5 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -132,6 +132,10 @@ spapr-tpm-proxy + + 1.2 + 2.0 + 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..0cfed39048 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -212,6 +212,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..ee77808566 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..fb428690d5 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..339c839168 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -173,6 +173,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincaps= data/qemu_5.0.0.aarch64.xml index ab72b7ffeb..169f347439 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -171,6 +171,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.0.0.ppc64.xml index d196676b14..b02b66a674 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -138,6 +138,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..f560826fed 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -214,6 +214,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..9b20589278 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..fbc7716675 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..5e84d521af 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -215,6 +215,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..bfb4ec38f2 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..03fa802a7b 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,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..6b21218f7f 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -173,6 +173,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincaps= data/qemu_5.2.0.aarch64.xml index ab72b7ffeb..169f347439 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -171,6 +171,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.2.0.ppc64.xml index b2c0577be9..50065d1a9b 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -138,6 +138,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..a37b9930be 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -215,6 +215,10 @@ passthrough emulator + + 1.2 + 2.0 + 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..d8937f0443 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,10 @@ passthrough emulator + + 1.2 + 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..0e557e715b 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,10 @@ passthrough emulator + + 1.2 + 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..096c8087bf 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -176,6 +176,10 @@ passthrough emulator + + 1.2 + 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..a67b6d014e 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -174,6 +174,10 @@ passthrough emulator + + 1.2 + 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..12cf2c9b0b 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -138,6 +138,10 @@ passthrough emulator + + 1.2 + 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..03e456f8e9 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -219,6 +219,10 @@ passthrough emulator + + 1.2 + 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..3b1911e0c5 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,10 @@ passthrough emulator + + 1.2 + 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..027ca34a16 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,10 @@ passthrough emulator + + 1.2 + 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..edd8cf8729 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -218,6 +218,10 @@ passthrough emulator + + 1.2 + 2.0 + diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 00dd9871d1..7a447bb5f0 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -150,12 +150,13 @@ bool virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap) { switch (cap) { + case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2: + case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0: + return true; 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; } --=20 2.35.1