From: Michal Privoznik <mprivozn@redhat.com> The aim of domaincapstest is to check domain capabilities XML with respect to qemu capabilities. And we used to have old qemu capabilities where only TPM-1.2 was supported. But as of v12.4.0-rc1~130 QEMU-7.2 or newer is required which means the code that's handling older QEMUs is required no more. Drop it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/domaincapstest.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index ed0210678f..ec2ac8cb36 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -298,15 +298,7 @@ doTestQemuInternal(const char *version, version, typestr, mach, arch, variant, flag); - 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); - } + g_setenv(TEST_TPM_ENV_VAR, TPM_VER_2_0, true); rc = virTestRun(name, test_virDomainCapsFormat, &data); -- 2.53.0