12:04 p.m.
If we can report whuether TPM is available, then mgmt apps can enable it
by default for new VMs. This is important because OS like Win11 consider
TPM to be mandatory.
Daniel P. Berrangé (3):
conf: add TPM devices to domain capabilities
qemu: fill in domain capabilities for TPMs
qemu: mock swtpm initialization in tests
docs/schemas/domaincaps.rng | 10 ++++++
src/conf/domain_capabilities.c | 14 ++++++++
src/conf/domain_capabilities.h | 10 ++++++
src/qemu/qemu_capabilities.c | 32 +++++++++++++++++++
src/qemu/qemu_capabilities.h | 3 ++
.../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 9 ++++++
.../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 9 ++++++
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 6 ++++
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 9 ++++++
.../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 10 ++++++
.../qemu_2.12.0-virt.aarch64.xml | 6 ++++
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 6 ++++
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 6 ++++
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 6 ++++
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 10 ++++++
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 6 ++++
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 6 ++++
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 10 ++++++
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 6 ++++
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 10 ++++++
.../qemu_4.0.0-virt.aarch64.xml | 4 +++
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 4 +++
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 4 +++
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 4 +++
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 10 ++++++
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 10 ++++++
.../qemu_4.2.0-virt.aarch64.xml | 4 +++
tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 4 +++
tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 ++++
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 4 +++
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 10 ++++++
.../qemu_5.0.0-virt.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 10 ++++++
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 10 ++++++
tests/domaincapsdata/qemu_5.1.0.sparc.xml | 4 +++
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 10 ++++++
.../qemu_5.2.0-virt.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 10 ++++++
tests/domaincapsdata/qemu_5.2.0.s390x.xml | 4 +++
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 10 ++++++
.../qemu_6.0.0-virt.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_6.0.0.s390x.xml | 4 +++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 10 ++++++
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 10 ++++++
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 10 ++++++
.../qemu_6.2.0-virt.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 9 ++++++
tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 10 ++++++
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 10 ++++++
tests/domaincapstest.c | 9 ++++++
75 files changed, 661 insertions(+)
--
2.33.1
12:04 p.m.
New subject: [libvirt PATCH 1/3] conf: add TPM devices to domain capabilities
This adds reporting of available TPM models and backends to the domain
capabilities schema
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/schemas/domaincaps.rng | 10 ++++++++++
src/conf/domain_capabilities.c | 14 ++++++++++++++
src/conf/domain_capabilities.h | 10 ++++++++++
3 files changed, 34 insertions(+)
diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
index 8b5267f741..1b6122507f 100644
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@@ -195,6 +195,9 @@
<optional>
<ref name="filesystem"/>
</optional>
+ <optional>
+ <ref name="tpm"/>
+ </optional>
</element>
</define>
@@ -240,6 +243,13 @@
</element>
</define>
+ <define name="tpm">
+ <element name="tpm">
+ <ref name="supported"/>
+ <ref name="enum"/>
+ </element>
+ </define>
+
<define name="features">
<element name="features">
<optional>
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 1766129092..fef1326190 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -533,6 +533,19 @@ virDomainCapsDeviceRNGFormat(virBuffer *buf,
}
+static void
+virDomainCapsDeviceTPMFormat(virBuffer *buf,
+ const virDomainCapsDeviceTPM *tpm)
+{
+ FORMAT_PROLOGUE(tpm);
+
+ ENUM_PROCESS(tpm, model, virDomainTPMModelTypeToString);
+ ENUM_PROCESS(tpm, backendModel, virDomainTPMBackendTypeToString);
+
+ FORMAT_EPILOGUE(tpm);
+}
+
+
static void
virDomainCapsDeviceFilesystemFormat(virBuffer *buf,
const virDomainCapsDeviceFilesystem *filesystem)
@@ -652,6 +665,7 @@ virDomainCapsFormat(const virDomainCaps *caps)
virDomainCapsDeviceHostdevFormat(&buf, &caps->hostdev);
virDomainCapsDeviceRNGFormat(&buf, &caps->rng);
virDomainCapsDeviceFilesystemFormat(&buf, &caps->filesystem);
+ virDomainCapsDeviceTPMFormat(&buf, &caps->tpm);
virBufferAdjustIndent(&buf, -2);
virBufferAddLit(&buf, "</devices>\n");
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index d44acdcd01..2fcad87fd8 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -120,6 +120,15 @@ struct _virDomainCapsDeviceRNG {
virDomainCapsEnum backendModel; /* virDomainRNGBackend */
};
+STATIC_ASSERT_ENUM(VIR_DOMAIN_TPM_MODEL_LAST);
+STATIC_ASSERT_ENUM(VIR_DOMAIN_TPM_TYPE_LAST);
+typedef struct _virDomainCapsDeviceTPM virDomainCapsDeviceTPM;
+struct _virDomainCapsDeviceTPM {
+ virTristateBool supported;
+ virDomainCapsEnum model; /* virDomainTPMModel */
+ virDomainCapsEnum backendModel; /* virDomainTPMBackendType */
+};
+
STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST);
typedef struct _virDomainCapsDeviceFilesystem virDomainCapsDeviceFilesystem;
struct _virDomainCapsDeviceFilesystem {
@@ -211,6 +220,7 @@ struct _virDomainCaps {
virDomainCapsDeviceHostdev hostdev;
virDomainCapsDeviceRNG rng;
virDomainCapsDeviceFilesystem filesystem;
+ virDomainCapsDeviceTPM tpm;
/* add new domain devices here */
virDomainCapsFeatureGIC gic;
--
2.33.1
12:04 p.m.
New subject: [libvirt PATCH 2/3] qemu: fill in domain capabilities for TPMs
This reports what TPM features QEMU supports, provided that swtpm is
installed in the host.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 32 +++++++++++++++++++
src/qemu/qemu_capabilities.h | 3 ++
.../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 +
.../qemu_2.12.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 +
.../qemu_4.0.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 +
.../qemu_4.2.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
.../qemu_5.0.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 +
.../qemu_5.2.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 +
.../qemu_6.0.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 +
.../qemu_6.2.0-virt.aarch64.xml | 1 +
tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 +
tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 +
71 files changed, 104 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a4c492dde2..374909bef2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -49,6 +49,7 @@
#include "qemu_process.h"
#include "qemu_firmware.h"
#include "virutil.h"
+#include "virtpm.h"
#include <fcntl.h>
#include <sys/stat.h>
@@ -6206,6 +6207,35 @@ virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps,
}
+void
+virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
+ virDomainCapsDeviceTPM *tpm)
+{
+ if (virTPMEmulatorInit() < 0) {
+ virResetLastError();
+ tpm->supported = VIR_TRISTATE_BOOL_NO;
+ } else {
+ tpm->supported = VIR_TRISTATE_BOOL_YES;
+ tpm->model.report = true;
+ tpm->backendModel.report = true;
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_TIS))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_TIS);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_CRB))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_CRB);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_SPAPR))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY);
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel,
VIR_DOMAIN_TPM_TYPE_PASSTHROUGH);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel,
VIR_DOMAIN_TPM_TYPE_EMULATOR);
+ }
+}
+
+
/**
* virQEMUCapsSupportsGICVersion:
* @qemuCaps: QEMU capabilities
@@ -6350,6 +6380,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps,
virDomainCapsDeviceVideo *video = &domCaps->video;
virDomainCapsDeviceRNG *rng = &domCaps->rng;
virDomainCapsDeviceFilesystem *filesystem = &domCaps->filesystem;
+ virDomainCapsDeviceTPM *tpm = &domCaps->tpm;
virDomainCapsMemoryBacking *memoryBacking = &domCaps->memoryBacking;
virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps);
@@ -6381,6 +6412,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps,
virQEMUCapsFillDomainDeviceHostdevCaps(qemuCaps, hostdev);
virQEMUCapsFillDomainDeviceRNGCaps(qemuCaps, rng);
virQEMUCapsFillDomainDeviceFSCaps(qemuCaps, filesystem);
+ virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, tpm);
virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps);
virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps);
virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 61bdbdb2ac..716e09123c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -803,6 +803,9 @@ void virQEMUCapsFillDomainDeviceRNGCaps(virQEMUCaps *qemuCaps,
void virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps,
virDomainCapsDeviceFilesystem *filesystem);
+void virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
+ virDomainCapsDeviceTPM *tpm);
+
bool virQEMUCapsGuestIsNative(virArch host,
virArch guest);
diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
index e18b33e044..43b50535b2 100644
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
@@ -170,6 +170,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
index 97402b1d4c..563324c3eb 100644
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
@@ -183,6 +183,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
index a52e436538..804bf8020e 100644
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
@@ -205,6 +205,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
index 83ebb741cc..1fcc26264c 100644
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
@@ -170,6 +170,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
index eb876a3748..2e426e632e 100644
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
@@ -185,6 +185,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
index 2c9a7a1c22..f22ee26665 100644
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
@@ -195,6 +195,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
index 6407b7ca36..2074c89875 100644
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
@@ -155,6 +155,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
index 27b717318a..a93313f980 100644
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
@@ -153,6 +153,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
index 26006d2c08..cb3edcbd56 100644
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
@@ -123,6 +123,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
index f289a4893c..5c3d9ce7db 100644
--- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
@@ -205,6 +205,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
index 8d9cebe20c..2c5b55008f 100644
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
@@ -185,6 +185,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
index 20b30564f4..b83ab782ae 100644
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
@@ -186,6 +186,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
index 45f578183e..ff261f97fb 100644
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -198,6 +198,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
index 36fc07f20c..8605db5cc8 100644
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
@@ -125,6 +125,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
index 2aa34677c0..f49b6907ff 100644
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
@@ -212,6 +212,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
index 19595be2b4..270d82301d 100644
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
@@ -186,6 +186,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index 62fbd05ccc..c278327bf6 100644
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -189,6 +189,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index 092a8db6b3..0932886192 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -201,6 +201,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
index a45bbc7fe5..8035f7230a 100644
--- a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
@@ -125,6 +125,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 3c4b6d9e00..def2bc4f2a 100644
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -189,6 +189,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index ba406ef7fd..09c63f3765 100644
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -189,6 +189,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index 72b5c236d2..5d02be2392 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -202,6 +202,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
index 5dd21b50dc..7108efe3b4 100644
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
@@ -162,6 +162,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
index fd0543974d..1e7db635d0 100644
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
@@ -160,6 +160,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
index ad1a1a399a..f109d36266 100644
--- a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
@@ -126,6 +126,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
index ede04824e9..b810ad737a 100644
--- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
@@ -222,6 +222,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index cd086b7e3a..ff963039d2 100644
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -189,6 +189,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 233f49a21b..fd21528fe8 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -195,6 +195,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index 03ebf381d0..49c4d4ee4e 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -204,6 +204,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 8806f2d8d6..c97e157e9c 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -195,6 +195,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 5df0f5f488..2cdcc105ef 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -203,6 +203,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index 2b306b27f3..6d2b6842ac 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -211,6 +211,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 792bac1298..05d606967b 100644
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
@@ -164,6 +164,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index 7b6f3a851a..f19ad5e6db 100644
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
@@ -162,6 +162,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 728f4e87fc..b1051f9208 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -127,6 +127,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index f344b289b2..fb162ea578 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -237,6 +237,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index fd8d3a8656..8054fadcef 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -203,6 +203,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 941d65431e..2cf71ac6dc 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -205,6 +205,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 98511dffd7..5687546978 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -212,6 +212,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index d673ddfaad..94c72d39af 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -165,6 +165,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index b879287180..e720d3476d 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -163,6 +163,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index 14d0bc3eaf..ada334d39a 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -128,6 +128,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 6bab719f7e..1c91144478 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -205,6 +205,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index addffcd080..9b6d0b21cd 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -206,6 +206,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 5a094acbdb..46ccede304 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -212,6 +212,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
index ddcffd9d44..5c1c0c4680 100644
--- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
@@ -104,6 +104,7 @@
<value>handle</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 428c6e30e8..85f951b321 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -206,6 +206,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index db262241c7..fa9a1ed6f1 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -206,6 +206,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 4538cf0dc8..c49f8e6fd0 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -212,6 +212,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index fb1118e33e..a652e30d3e 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -165,6 +165,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index b879287180..e720d3476d 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -163,6 +163,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index 094295ff29..9eba83e41f 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -128,6 +128,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index c30de65f88..2a2ca8abcf 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -239,6 +239,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index a6a8f0ab43..4085e60909 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -206,6 +206,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index b7ac45c731..5be91fdcf2 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -207,6 +207,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 6f53b3ea0f..5700b949a7 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -213,6 +213,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index 7a52cce114..ee1ae1f796 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -166,6 +166,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index c51e361c7f..50fb11e974 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -164,6 +164,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
index d6d8262a34..13fa3a637e 100644
--- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -240,6 +240,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 71aefb5bff..b6379b545c 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -207,6 +207,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index bae2187aa2..c1ffb6f640 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -208,6 +208,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index a9b4011557..3b58870939 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -213,6 +213,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 5a261f2d0e..c3cb730e85 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -208,6 +208,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index df8bdae102..e9e816b1bc 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -208,6 +208,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 4d12105659..d3d2814420 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -214,6 +214,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index 8b590fd40d..230f0701ab 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -168,6 +168,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index 496b910336..e0a51beeab 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -166,6 +166,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index 93c901816e..1f157234ba 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -126,6 +126,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index c382ec462c..691cacbc38 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -208,6 +208,7 @@
<value>virtiofs</value>
</enum>
</filesystem>
+ <tpm supported='no'/>
</devices>
<features>
<gic supported='no'/>
--
2.33.1
3:06 a.m.
New subject: [libvirt PATCH 2/3] qemu: fill in domain capabilities for TPMs
On 11/23/21 19:04, Daniel P. Berrangé wrote:
This reports what TPM features QEMU supports, provided that swtpm is
installed in the host.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
71 files changed, 104 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a4c492dde2..374909bef2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -49,6 +49,7 @@
#include "qemu_process.h"
#include "qemu_firmware.h"
#include "virutil.h"
+#include "virtpm.h"
#include <fcntl.h>
#include <sys/stat.h>
@@ -6206,6 +6207,35 @@ virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps,
}
+void
+virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
+ virDomainCapsDeviceTPM *tpm)
+{
+ if (virTPMEmulatorInit() < 0) {
+ virResetLastError();
+ tpm->supported = VIR_TRISTATE_BOOL_NO;
+ } else {
Nitpick. Put 'return' in the branch above and drop 'else'. One level of
indendation can be saved this way.
+ tpm->supported = VIR_TRISTATE_BOOL_YES;
+ tpm->model.report = true;
+ tpm->backendModel.report = true;
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_TIS))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_TIS);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_CRB))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_CRB);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_SPAPR))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY);
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel,
VIR_DOMAIN_TPM_TYPE_PASSTHROUGH);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel,
VIR_DOMAIN_TPM_TYPE_EMULATOR);
+ }
+}
Michal
3:13 a.m.
New subject: [libvirt PATCH 2/3] qemu: fill in domain capabilities for TPMs
On Wed, Nov 24, 2021 at 10:06:12AM +0100, Michal Prívozník wrote:
On 11/23/21 19:04, Daniel P. Berrangé wrote:
> This reports what TPM features QEMU supports, provided that swtpm is
> installed in the host.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
> 71 files changed, 104 insertions(+)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index a4c492dde2..374909bef2 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -49,6 +49,7 @@
> #include "qemu_process.h"
> #include "qemu_firmware.h"
> #include "virutil.h"
> +#include "virtpm.h"
>
> #include <fcntl.h>
> #include <sys/stat.h>
> @@ -6206,6 +6207,35 @@ virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps,
> }
>
>
> +void
> +virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
> + virDomainCapsDeviceTPM *tpm)
> +{
> + if (virTPMEmulatorInit() < 0) {
> + virResetLastError();
> + tpm->supported = VIR_TRISTATE_BOOL_NO;
> + } else {
Nitpick. Put 'return' in the branch above and drop 'else'. One level of
indendation can be saved this way.
THis logic is wrong actually, as even if swtpm is not present, we can
still support passthrough mode TPMs.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
3:10 a.m.
New subject: [libvirt PATCH 2/3] qemu: fill in domain capabilities for TPMs
On Tue, Nov 23, 2021 at 18:04:07 +0000, Daniel P. Berrangé wrote:
This reports what TPM features QEMU supports, provided that swtpm is
installed in the host.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
[...]
diff --git a/src/qemu/qemu_capabilities.c
b/src/qemu/qemu_capabilities.c
index a4c492dde2..374909bef2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
[...]
@@ -6206,6 +6207,35 @@ virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps
*qemuCaps,
}
+void
+virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
+ virDomainCapsDeviceTPM *tpm)
+{
+ if (virTPMEmulatorInit() < 0) {
+ virResetLastError();
Resetting the error here is not acceptable as it pollutes logs with:
2021-11-24 08:58:21.996+0000: 3685776: error : virTPMEmulatorInit:313 : Unable to find
'swtpm' binary in $PATH: No such file or directory
each time capabilities are queried. You will certainly need a "quiet"
variant of this function.
+ tpm->supported = VIR_TRISTATE_BOOL_NO;
+ } else {
+ tpm->supported = VIR_TRISTATE_BOOL_YES;
+ tpm->model.report = true;
+ tpm->backendModel.report = true;
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_TIS))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_TIS);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_CRB))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_CRB);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_SPAPR))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY);
In certain versions (visible in the next commit) neither of the above is
supported which resutls in:
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
index 804bf8020e..f76624ffc8 100644
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
@@ -205,7 +205,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
Does it even make sense to show that TPM is supported?
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel,
VIR_DOMAIN_TPM_TYPE_PASSTHROUGH);
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR))
+ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel,
VIR_DOMAIN_TPM_TYPE_EMULATOR);
+ }
+}
+
+
/**
* virQEMUCapsSupportsGICVersion:
* @qemuCaps: QEMU capabilities
[...]
3:17 a.m.
New subject: [libvirt PATCH 2/3] qemu: fill in domain capabilities for TPMs
On Wed, Nov 24, 2021 at 10:10:32AM +0100, Peter Krempa wrote:
On Tue, Nov 23, 2021 at 18:04:07 +0000, Daniel P. Berrangé wrote:
> This reports what TPM features QEMU supports, provided that swtpm is
> installed in the host.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
[...]
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index a4c492dde2..374909bef2 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
[...]
> @@ -6206,6 +6207,35 @@ virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps,
> }
>
>
> +void
> +virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
> + virDomainCapsDeviceTPM *tpm)
> +{
> + if (virTPMEmulatorInit() < 0) {
> + virResetLastError();
Resetting the error here is not acceptable as it pollutes logs with:
2021-11-24 08:58:21.996+0000: 3685776: error : virTPMEmulatorInit:313 : Unable to find
'swtpm' binary in $PATH: No such file or directory
each time capabilities are queried. You will certainly need a "quiet"
variant of this function.
> + tpm->supported = VIR_TRISTATE_BOOL_NO;
> + } else {
> + tpm->supported = VIR_TRISTATE_BOOL_YES;
> + tpm->model.report = true;
> + tpm->backendModel.report = true;
> +
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_TIS))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_TIS);
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_CRB))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_CRB);
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_SPAPR))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR);
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model,
VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY);
In certain versions (visible in the next commit) neither of the above is
supported which resutls in:
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
index 804bf8020e..f76624ffc8 100644
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
@@ -205,7 +205,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
Does it even make sense to show that TPM is supported?
True, we can filter out if count(model) == 0 or count(backendModel) == 0
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
4:51 a.m.
New subject: [libvirt PATCH 2/3] qemu: fill in domain capabilities for TPMs
On 11/24/21 10:10, Peter Krempa wrote:
On Tue, Nov 23, 2021 at 18:04:07 +0000, Daniel P. Berrangé wrote:
> This reports what TPM features QEMU supports, provided that swtpm is
> installed in the host.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
[...]
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index a4c492dde2..374909bef2 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
[...]
> @@ -6206,6 +6207,35 @@ virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps,
> }
>
>
> +void
> +virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
> + virDomainCapsDeviceTPM *tpm)
> +{
> + if (virTPMEmulatorInit() < 0) {
> + virResetLastError();
Resetting the error here is not acceptable as it pollutes logs with:
2021-11-24 08:58:21.996+0000: 3685776: error : virTPMEmulatorInit:313 : Unable to find
'swtpm' binary in $PATH: No such file or directory
each time capabilities are queried. You will certainly need a "quiet"
variant of this function.
> + tpm->supported = VIR_TRISTATE_BOOL_NO;
> + } else {
> + tpm->supported = VIR_TRISTATE_BOOL_YES;
> + tpm->model.report = true;
> + tpm->backendModel.report = true;
> +
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_TIS))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_TIS);
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_CRB))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_CRB);
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_SPAPR))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model, VIR_DOMAIN_TPM_MODEL_SPAPR);
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY))
> + VIR_DOMAIN_CAPS_ENUM_SET(tpm->model,
VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY);
In certain versions (visible in the next commit) neither of the above is
supported which resutls in:
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
index 804bf8020e..f76624ffc8 100644
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
@@ -205,7 +205,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
Does it even make sense to show that TPM is supported?
I think it does. Because domain capabilities XML is not QEMU specific.
If 'virsh domcapabilities' was ran against say LXC it wouldn't show TPM.
Or am I misunderstanding your question?
Michal
5:03 a.m.
New subject: [libvirt PATCH 2/3] qemu: fill in domain capabilities for TPMs
On Wed, Nov 24, 2021 at 11:51:29 +0100, Michal Prívozník wrote:
On 11/24/21 10:10, Peter Krempa wrote:
> On Tue, Nov 23, 2021 at 18:04:07 +0000, Daniel P. Berrangé wrote:
>> This reports what TPM features QEMU supports, provided that swtpm is
>> installed in the host.
>>
>> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
>> ---
>
> [...]
>
>> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
>> index a4c492dde2..374909bef2 100644
>> --- a/src/qemu/qemu_capabilities.c
>> +++ b/src/qemu/qemu_capabilities.c
[...]
> diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
> index 804bf8020e..f76624ffc8 100644
> --- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
> +++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
> @@ -205,7 +205,12 @@
> <value>handle</value>
> </enum>
> </filesystem>
> - <tpm supported='no'/>
> + <tpm supported='yes'>
> + <enum name='model'/>
> + <enum name='backendModel'>
> + <value>emulator</value>
> + </enum>
> + </tpm>
> </devices>
> <features>
> <gic supported='no'/>
>
> Does it even make sense to show that TPM is supported?
I think it does. Because domain capabilities XML is not QEMU specific.
If 'virsh domcapabilities' was ran against say LXC it wouldn't show TPM.
Or am I misunderstanding your question?
I was pointing to the fact that if the given qemu doesn't support any
TPM frontend (as witnessed by the empty 'model') then it probably
doesn't make sense to say that TPM is actually supported.
12:04 p.m.
New subject: [libvirt PATCH 3/3] qemu: mock swtpm initialization in tests
The domain capabilities won't report TPM support unless SWTPM can be
initialized. To avoid relying on the swtpm install in the host, mock
the entire initialization method, since all it needs todo is return
a non-error value.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 7 ++++++-
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml | 5 ++++-
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 5 ++++-
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 5 ++++-
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 5 ++++-
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 5 ++++-
tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 5 ++++-
tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 7 ++++++-
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 ++++-
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 ++++-
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 ++++-
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 ++++-
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 10 +++++++++-
tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 11 ++++++++++-
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 11 ++++++++++-
tests/domaincapstest.c | 9 +++++++++
70 files changed, 592 insertions(+), 69 deletions(-)
diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
index 43b50535b2..ea9737d9ce 100644
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
@@ -170,7 +170,15 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
index 563324c3eb..cccc6830f9 100644
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
@@ -183,7 +183,15 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
index 804bf8020e..f76624ffc8 100644
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
@@ -205,7 +205,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
index 1fcc26264c..3a8aa2ab71 100644
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
@@ -170,7 +170,15 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
index 2e426e632e..9f41dfaf2b 100644
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
@@ -185,7 +185,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
index f22ee26665..d5f9d8ebe3 100644
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
@@ -195,7 +195,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
index 2074c89875..9c49555d7f 100644
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
@@ -155,7 +155,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
index a93313f980..3a9020f985 100644
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
@@ -153,7 +153,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
index cb3edcbd56..e7ceecf169 100644
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
@@ -123,7 +123,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
index 5c3d9ce7db..3ed806d9c2 100644
--- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
@@ -205,7 +205,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
index 2c5b55008f..dc2c3ec4dd 100644
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
@@ -185,7 +185,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
index b83ab782ae..4f80439eb4 100644
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
@@ -186,7 +186,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
index ff261f97fb..301101095c 100644
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -198,7 +198,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
index 8605db5cc8..11bae01104 100644
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
@@ -125,7 +125,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
index f49b6907ff..9f259efd56 100644
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
@@ -212,7 +212,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
index 270d82301d..650728566e 100644
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
@@ -186,7 +186,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index c278327bf6..c4277c53a1 100644
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -189,7 +189,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index 0932886192..1a5bc25b99 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -201,7 +201,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
index 8035f7230a..23277f4d51 100644
--- a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
@@ -125,7 +125,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index def2bc4f2a..6e3ddda356 100644
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -189,7 +189,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index 09c63f3765..8f3911b4b3 100644
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -189,7 +189,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index 5d02be2392..e744ac27ac 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -202,7 +202,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
index 7108efe3b4..b586ee4f50 100644
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
@@ -162,7 +162,10 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
index 1e7db635d0..bc765cc6c0 100644
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
@@ -160,7 +160,10 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
index f109d36266..0e9c13ada8 100644
--- a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
@@ -126,7 +126,10 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
index b810ad737a..4277f31369 100644
--- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
@@ -222,7 +222,10 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index ff963039d2..24e732d9c3 100644
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -189,7 +189,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index fd21528fe8..3ee7feea48 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -195,7 +195,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index 49c4d4ee4e..80b1ce8ef9 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -204,7 +204,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index c97e157e9c..0f1d398e2c 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -195,7 +195,16 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 2cdcc105ef..c8a77cdd41 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -203,7 +203,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index 6d2b6842ac..91b3ed6f80 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -211,7 +211,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 05d606967b..020809b71c 100644
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
@@ -164,7 +164,10 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index f19ad5e6db..4ef0f4498a 100644
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
@@ -162,7 +162,10 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index b1051f9208..4c3a2c6d98 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -127,7 +127,12 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>spapr-tpm-proxy</value>
+ </enum>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index fb162ea578..4705afcef5 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -237,7 +237,10 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 8054fadcef..6578fd04b6 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -203,7 +203,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 2cf71ac6dc..8a6797c2f1 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -205,7 +205,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 5687546978..b8737613e9 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -212,7 +212,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index 94c72d39af..f8cea230d9 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -165,7 +165,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index e720d3476d..ab72b7ffeb 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -163,7 +163,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index ada334d39a..5772045e35 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -128,7 +128,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-spapr</value>
+ <value>spapr-tpm-proxy</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 1c91144478..51ca1d98e0 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -205,7 +205,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index 9b6d0b21cd..3468fb2e72 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -206,7 +206,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 46ccede304..034036ca96 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -212,7 +212,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
index 5c1c0c4680..8bba39071b 100644
--- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
@@ -104,7 +104,10 @@
<value>handle</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 85f951b321..8ff49c7899 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -206,7 +206,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index fa9a1ed6f1..2301a475eb 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -206,7 +206,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index c49f8e6fd0..d3a4b01234 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -212,7 +212,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index a652e30d3e..a863a6052d 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -165,7 +165,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index e720d3476d..ab72b7ffeb 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -163,7 +163,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index 9eba83e41f..051b7d43a8 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -128,7 +128,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-spapr</value>
+ <value>spapr-tpm-proxy</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index 2a2ca8abcf..0cf8a4a5da 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -239,7 +239,10 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 4085e60909..41a54985d7 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -206,7 +206,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index 5be91fdcf2..90acb29775 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -207,7 +207,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 5700b949a7..768cba5a41 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -213,7 +213,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index ee1ae1f796..61eab9de0e 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -166,7 +166,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index 50fb11e974..fa722b5fd3 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -164,7 +164,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
index 13fa3a637e..95d9918ea5 100644
--- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -240,7 +240,10 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'/>
+ <enum name='backendModel'/>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index b6379b545c..7a95c530f9 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -207,7 +207,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index c1ffb6f640..f4d0fcf673 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -208,7 +208,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 3b58870939..2c761fc1af 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -213,7 +213,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index c3cb730e85..67fc449f5d 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -208,7 +208,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index e9e816b1bc..9d68c0a404 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -208,7 +208,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index d3d2814420..8db840faac 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -214,7 +214,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index 230f0701ab..f6045623f5 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -168,7 +168,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index e0a51beeab..35e18adcd5 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -166,7 +166,15 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index 1f157234ba..8fed9d30b7 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -126,7 +126,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-spapr</value>
+ <value>spapr-tpm-proxy</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 691cacbc38..0f89790b60 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -208,7 +208,16 @@
<value>virtiofs</value>
</enum>
</filesystem>
- <tpm supported='no'/>
+ <tpm supported='yes'>
+ <enum name='model'>
+ <value>tpm-tis</value>
+ <value>tpm-crb</value>
+ </enum>
+ <enum name='backendModel'>
+ <value>passthrough</value>
+ <value>emulator</value>
+ </enum>
+ </tpm>
</devices>
<features>
<gic supported='no'/>
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 4a46acb9ad..3f791aea6e 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -22,6 +22,7 @@
#include "domain_capabilities.h"
#include "virfilewrapper.h"
#include "configmake.h"
+#include "virtpm.h"
#define VIR_FROM_THIS VIR_FROM_NONE
@@ -126,6 +127,14 @@ fillQemuCaps(virDomainCaps *domCaps,
return 0;
}
+
+
+/* Enough to tell capabilities code that swtpm is usable */
+int virTPMEmulatorInit(void)
+{
+ return 0;
+}
+
#endif /* WITH_QEMU */
--
2.33.1
3:06 a.m.
On 11/23/21 19:04, Daniel P. Berrangé wrote:
If we can report whuether TPM is available, then mgmt apps can enable
it
by default for new VMs. This is important because OS like Win11 consider
TPM to be mandatory.
Daniel P. Berrangé (3):
conf: add TPM devices to domain capabilities
qemu: fill in domain capabilities for TPMs
qemu: mock swtpm initialization in tests
75 files changed, 661 insertions(+)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
3:11 a.m.
On Wed, Nov 24, 2021 at 10:06:12 +0100, Michal Prívozník wrote:
On 11/23/21 19:04, Daniel P. Berrangé wrote:
> If we can report whuether TPM is available, then mgmt apps can enable it
> by default for new VMs. This is important because OS like Win11 consider
> TPM to be mandatory.
>
> Daniel P. Berrangé (3):
> conf: add TPM devices to domain capabilities
> qemu: fill in domain capabilities for TPMs
> qemu: mock swtpm initialization in tests
>
> 75 files changed, 661 insertions(+)
>
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
I agree, but I think 3/3 and 2/3 should be swapped because the build
after the current 2/3 depends on host configuration. So chances are the
build might fail for someone at that point.
Jirka
3:15 a.m.
On Wed, Nov 24, 2021 at 10:11:44AM +0100, Jiri Denemark wrote:
On Wed, Nov 24, 2021 at 10:06:12 +0100, Michal Prívozník wrote:
> On 11/23/21 19:04, Daniel P. Berrangé wrote:
> > If we can report whuether TPM is available, then mgmt apps can enable it
> > by default for new VMs. This is important because OS like Win11 consider
> > TPM to be mandatory.
> >
> > Daniel P. Berrangé (3):
> > conf: add TPM devices to domain capabilities
> > qemu: fill in domain capabilities for TPMs
> > qemu: mock swtpm initialization in tests
> >
>
> > 75 files changed, 661 insertions(+)
> >
>
> Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
I agree, but I think 3/3 and 2/3 should be swapped because the build
after the current 2/3 depends on host configuration. So chances are the
build might fail for someone at that point.
Hmm, it shouldn't depend on host config, because virFindFileInPath
is mocked in testutuilsqemu.c which prevents the test suite from
ever detecting swtpm.
Did you see a particular problem ?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
3:19 a.m.
On Wed, Nov 24, 2021 at 09:15:44 +0000, Daniel P. Berrangé wrote:
On Wed, Nov 24, 2021 at 10:11:44AM +0100, Jiri Denemark wrote:
> On Wed, Nov 24, 2021 at 10:06:12 +0100, Michal Prívozník wrote:
> > On 11/23/21 19:04, Daniel P. Berrangé wrote:
> > > If we can report whuether TPM is available, then mgmt apps can enable it
> > > by default for new VMs. This is important because OS like Win11 consider
> > > TPM to be mandatory.
> > >
> > > Daniel P. Berrangé (3):
> > > conf: add TPM devices to domain capabilities
> > > qemu: fill in domain capabilities for TPMs
> > > qemu: mock swtpm initialization in tests
> > >
> >
> > > 75 files changed, 661 insertions(+)
> > >
> >
> > Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
>
> I agree, but I think 3/3 and 2/3 should be swapped because the build
> after the current 2/3 depends on host configuration. So chances are the
> build might fail for someone at that point.
Hmm, it shouldn't depend on host config, because virFindFileInPath
is mocked in testutuilsqemu.c which prevents the test suite from
ever detecting swtpm.
Did you see a particular problem ?
No it actually works as expected. I've tried both when swtpm is present
and when not present and both cases work well.
3:22 a.m.
On Wed, Nov 24, 2021 at 09:15:44 +0000, Daniel P. Berrangé wrote:
On Wed, Nov 24, 2021 at 10:11:44AM +0100, Jiri Denemark wrote:
> On Wed, Nov 24, 2021 at 10:06:12 +0100, Michal Prívozník wrote:
> > On 11/23/21 19:04, Daniel P. Berrangé wrote:
> > > If we can report whuether TPM is available, then mgmt apps can enable it
> > > by default for new VMs. This is important because OS like Win11 consider
> > > TPM to be mandatory.
> > >
> > > Daniel P. Berrangé (3):
> > > conf: add TPM devices to domain capabilities
> > > qemu: fill in domain capabilities for TPMs
> > > qemu: mock swtpm initialization in tests
> > >
> >
> > > 75 files changed, 661 insertions(+)
> > >
> >
> > Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
>
> I agree, but I think 3/3 and 2/3 should be swapped because the build
> after the current 2/3 depends on host configuration. So chances are the
> build might fail for someone at that point.
Hmm, it shouldn't depend on host config, because virFindFileInPath
is mocked in testutuilsqemu.c which prevents the test suite from
ever detecting swtpm.
Oh, I didn't realize that. Let's just pretend I haven't said anything
:-)
Jirka
1097
days inactive
1098
days old
14 comments
4 participants
participants (4)
-
Daniel P. Berrangé -
Jiri Denemark -
Michal Prívozník -
Peter Krempa