[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&gt; --- 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