From nobody Sun May 5 23:53:03 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=1659080586; cv=none; d=zohomail.com; s=zohoarc; b=eMQwynVBOfvaIvgIW1r5nPsS1lcOg6NYSHPDXFsnFViz4r6z8P7QravCqstsWw0xFIsN4CWaCWnWIvRJwqmiwF4K28/ynwbhqO+Fokw33zZKQYjWD9mm4+FakMDpuKsfgfBzI+Zb3sCrH9VX9JfWhtG/RMoy9l266f1QBcUb3cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659080586; 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=4gGh+HdfVob7PPyd5h64PwZZ60JLFeOLAKbtH3y73o8=; b=X0QZv/xMhmNp68/uNY1yZAgHhFxQ3LkPzfAi7gmb+Swzuj7Po9rBb+kwM2vUHX2qb4NvKtP5t30kFVrVgGlIw49p3MthNAoy0kamarWl0hvpKUXttipgeEsUl4GHpK8wzo0M+dqXbkodmWpnSXlZE8MmnI3Km7zhfL/4GkFpzd8= 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 165908058689314.487241604014343; Fri, 29 Jul 2022 00:43:06 -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-632-E4FbnDOiNHK15aZIkArIOA-1; Fri, 29 Jul 2022 03:42:20 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7EA1D85A586; Fri, 29 Jul 2022 07:42:18 +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 6CC6C492CA2; Fri, 29 Jul 2022 07:42:18 +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 2F517193211F; 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 33989193211B for ; Fri, 29 Jul 2022 07:42:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2A390492C3B; Fri, 29 Jul 2022 07:42:15 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA4A940315E for ; Fri, 29 Jul 2022 07:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659080585; 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=4gGh+HdfVob7PPyd5h64PwZZ60JLFeOLAKbtH3y73o8=; b=f8bSYprD9jZAjDP5QHzKaGAhYc+2QHjsEpjQNRTmxIXVX1n+2DTrmM0gJYwlCKv+25Jtyh 7DHmdlg7LI/PkLX79eQ92luMowgwJ0+472RuWEVju1gj5YBiL69Yjwm3uBjTaP+z9IxMaT WCDcQknTL/ItsRAPwxQlswf2tNeNtZo= X-MC-Unique: E4FbnDOiNHK15aZIkArIOA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/3] virtpm: Use corresponding type for argument for virTPM*CapsGet() Date: Fri, 29 Jul 2022 09:42:11 +0200 Message-Id: <787c7fd4c4936c99737fd4ea4f40d1d9de3e501f.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.9 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: 1659080589052100005 Content-Type: text/plain; charset="utf-8"; x-default="true" In virtpm.h there are two functions exposed for querying swtpm and swtpm_setup capabilieis: virTPMSwtpmCapsGet() and virTPMSwtpmSetupCapsGet(), respectively. The capabilities we are interested in are defined in two separate enums (virTPMSwtpmFeature and virTPMSwtpmSetupFeature), but these functions accept capability as an unsigned int rather than their respective enum. While this makes sense for virTPMBinaryGetCaps(), which is a module internal helper that both exposed functions call, there's no need for the functions themselves to accept unsigned int. Signed-off-by: Michal Privoznik Reviewed-by: Andrea Bolognani --- src/util/virtpm.c | 4 ++-- src/util/virtpm.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 3c961c11cb..2f2b061fee 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -345,13 +345,13 @@ virTPMBinaryGetCaps(virTPMBinary binary, } =20 bool -virTPMSwtpmCapsGet(unsigned int cap) +virTPMSwtpmCapsGet(virTPMSwtpmFeature cap) { return virTPMBinaryGetCaps(VIR_TPM_BINARY_SWTPM, cap); } =20 bool -virTPMSwtpmSetupCapsGet(unsigned int cap) +virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap) { return virTPMBinaryGetCaps(VIR_TPM_BINARY_SWTPM_SETUP, cap); } diff --git a/src/util/virtpm.h b/src/util/virtpm.h index 89adbdf720..a873881b23 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -28,9 +28,6 @@ char *virTPMGetSwtpmIoctl(void); =20 bool virTPMHasSwtpm(void); =20 -bool virTPMSwtpmCapsGet(unsigned int cap); -bool virTPMSwtpmSetupCapsGet(unsigned int cap); - typedef enum { VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD, =20 @@ -50,3 +47,6 @@ typedef enum { =20 VIR_ENUM_DECL(virTPMSwtpmFeature); VIR_ENUM_DECL(virTPMSwtpmSetupFeature); + +bool virTPMSwtpmCapsGet(virTPMSwtpmFeature cap); +bool virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap); --=20 2.35.1 From nobody Sun May 5 23:53:03 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=1659080586; cv=none; d=zohomail.com; s=zohoarc; b=DW3SKVapVLneqtzXINsYhDPwIhWlLzRNJZWG/3zzs7cSVUn6lfyrWET703lYW/Bp63pZNLmphKGwptg3fu14+ZiFATFLplcWLqtzMdvmaXYrfEjYAaZqwcnGpPsDfVNQiV0o0zvKwsND9N/BOVUr4g6XhLNELCRthz2yJJeE3Uk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659080586; 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=X4RO0b7LczeMAiNr/0I69lzFu2zCsRdEW2G6mivMdo4=; b=nThAf3J6vDqUsMN/Twio67LqbpNng8oDuQC0AobeefXBWiq1mvvPbsR2OrAKv3C6bBL8FZYZ7JUTAVe7XkOe/hIIWE+2u62X2vQpayZzFZ13rw10U0/iGx526u+5FP6VCY52hbD+HNfzyyjgBj4X8oLEr/46CaEZaTC3sUUsWM4= 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 1659080586571531.1435355411464; Fri, 29 Jul 2022 00:43:06 -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-556-E_MRgPtXOYWjJz_rCXNJmA-1; Fri, 29 Jul 2022 03:42:19 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC38E1019C8E; Fri, 29 Jul 2022 07:42:17 +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 B8607492C3B; Fri, 29 Jul 2022 07:42:17 +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 80A051932120; Fri, 29 Jul 2022 07:42:17 +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 C0520193211B for ; Fri, 29 Jul 2022 07:42:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B55CB403160; Fri, 29 Jul 2022 07:42:15 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60E45492C3B 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=1659080585; 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=X4RO0b7LczeMAiNr/0I69lzFu2zCsRdEW2G6mivMdo4=; b=HweaEeGe/+jgcY11mFtFLKvcno2uTHJir2GZLABlrvPgWEJpb/WlkPROIYNtlW03V7g0XC jwweHhwcaHNu6wzHimeuOLvfu694eqFYRZjrOz/xZjdRsqYqLBSV7ocpCp+VE+qhgrckcW D3gAMJtJb6KrvwWXcY/Pb6JdJrNAup0= X-MC-Unique: E_MRgPtXOYWjJz_rCXNJmA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/3] testutilsqemu: Mock virTPMSwtpmSetupCapsGet() Date: Fri, 29 Jul 2022 09:42:12 +0200 Message-Id: <182a0ab2295f889aba625d391e0b45e78d7c1e34.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.9 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: 1659080587062100003 Content-Type: text/plain; charset="utf-8"; x-default="true" In a recent commit of v8.5.0-85-g430ab88ab1 I've made domaincaps XML report supported TPM versions. This was done by calling virTPMSwtpmSetupCapsGet(). But this function isn't mocked and thus domaincapstest calls the real implementation, which tries to execute swtpm_setup binary. This fails, because virFindFileInPath() is mocked in such way that it returns NULL for anything else than qemu-*. Anyway, while the real binary is not executed after all, we should mock the function which tries to execute it so that predictable result is returned. Signed-off-by: Michal Privoznik Reviewed-by: Andrea Bolognani --- tests/testutilsqemu.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 6dabbaf36a..00dd9871d1 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -146,6 +146,24 @@ bool virTPMHasSwtpm(void) } =20 =20 +bool +virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap) +{ + switch (cap) { + 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; + } + + return false; +} + + virCapsHostNUMA * virCapabilitiesHostNUMANewHost(void) { --=20 2.35.1 From nobody Sun May 5 23:53:03 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=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