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.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

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 79d14234fe78c5fba432e76f3547bbe89782ee84..ea9737d9ce51be41ba47cc66e7a8bc9c6d6009d5 100644 (file)
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
@@ -176,6 +176,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 fc71f9cc7c9cbb383db5c34c546cc2441bcb5b19..cccc6830f9d4a0eb3236b9b1f0807b68a93bd8f8 100644 (file)
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
@@ -189,6 +189,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
index 44d57900e20484b94286ed5444f7ad54e319f288..3a8aa2ab71b8ec2dba80155fbe118393eb19ccf2 100644 (file)
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
@@ -176,6 +176,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 e9082540b74cc482676e6f1ae673f5d76c782058..9f41dfaf2bc9df99a24bedd750246d7482be4a21 100644 (file)
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
@@ -192,6 +192,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 1c91661942433368799dede11f21f1ff2a820be3..d5f9d8ebe33d5c0609a7ba72434e0d76f0fec55f 100644 (file)
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
@@ -202,6 +202,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
index 2e5e63308dc39fe87de946ccec657891f5480a8e..dc2c3ec4dde79d7a28eb3df0e94ca0570423eec5 100644 (file)
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
@@ -192,6 +192,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 ab63745e977b485572c3e9eb7826ba8db5546c24..4f80439eb40e44c50d9d78198f5ebf32bd7de034 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
@@ -193,6 +193,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 119b7020a7ca79a34e8981395e78ae832aebf3ac..301101095cab1625e929e927aee73133b3534ffc 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -205,6 +205,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
index 087f3608b2a456db046410d3724d10a285b0bb52..650728566ed835166a0d20d60dfed577db22f662 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
@@ -193,6 +193,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 5c0cf79efdf25a9d9b9d0bb04eef996b91b21fc7..c4277c53a1044e5e046172c24f01395db6a611ef 100644 (file)
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -196,6 +196,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 e51dc28f79a63ccbacc37684e4747c2f5e961d02..1a5bc25b99e3a6f6a90cde1ea51992e1f8d37724 100644 (file)
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -208,6 +208,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 5b42add078ec79a3f848d96f7952fd2412355e64..6e3ddda3560b5777eb0fb08d86f6ba185811e619 100644 (file)
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -196,6 +196,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 5e20814beb568776559e01fb4bb00e39925c641e..8f3911b4b3eccde0faf878202045b0e61ddc1a2c 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -196,6 +196,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 fa41ed288b9679065bf10e5218f53e18e1d6e094..e744ac27acb910bfb781c64d12de798e6695b360 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -209,6 +209,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index 14f00628178daa9538b042ded31f89a26575e724..24e732d9c398023e64672999a065d93bbdd7c7f5 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -196,6 +196,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 f1446f86555bd2480420c838fff1299ff3b884a1..3ee7feea48d7a5d326f558a3e196e4dbbbb3a6cf 100644 (file)
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -202,6 +202,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 77aca157b1305d9f147303b8e94000c71bb9b167..80b1ce8ef902762de94092dffd19e2b7d74ada6e 100644 (file)
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -211,6 +211,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 854d62b89e62cae0d34e96eb19c00049f5639141..0f1d398e2cd72034b64639a11997953bf459d17a 100644 (file)
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -202,6 +202,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 739e0c6a13914cf4893c11d4482fdd1e8ee75daa..c8a77cdd415d6b89af1d7044183381b987cb3ccd 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -210,6 +210,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 30de3cede78ebb56f5957c8e1c5c14c3c58a2e0d..91b3ed6f80e18b2fc6c9fdda0595a2d70e644f7c 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -218,6 +218,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 6b8e895ff65a182c04d7438368f0e59a7ee7ba11..6578fd04b6851d95da787345e882649048b613ff 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -210,6 +210,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 b0eba3550ac951a46601cad1945b5d112d03db02..8a6797c2f1b7b8a013a1ea2c070300957b678ccf 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -212,6 +212,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 fdce0eaaad755387ebc731aceba9f37bbf4dc44c..b8737613e96275dda7486eb9c242692a52a20240 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -219,6 +219,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index f926e025aaa5e91f02e24b8aa7c0b39ad20524fe..f8cea230d9ce8f4d5eca8032d0a570ceabacfc13 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -171,6 +171,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index 3c842d3642f6634f50f836f891b942a6c582ba1f..ab72b7ffeb2fce58d5cae8188f0829d44708bd97 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -169,6 +169,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index f85f4e6268db9afae3523bc093ed447af2b22c18..5772045e35176964d831af1a53995e3c93ce835c 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -135,6 +135,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 4a4893c0302b77c4417f3d8e106e122b014b2816..51ca1d98e09d2f40fc974b32fb17fe003057ab33 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -212,6 +212,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 5b4bb4246e120e61856be054f94a4f7bf84ba784..3468fb2e72c69b74b75140948759e43c9243eb05 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -213,6 +213,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 b28f7dd5493fa8954d7e02deeaeede19fc2e4173..034036ca962432c45a2a88fde4a49ebbb34b5df2 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -219,6 +219,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 1eabdf1a6d2a7a62a801be61850f19b5d184e2eb..8ff49c7899e24e5f7b23b1d3676d17133fabb598 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -213,6 +213,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 794e1d7b227f02ec86ec12b6c23e380cda6c279c..2301a475eb0761bb4ccfc46217017a611cad4bca 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -213,6 +213,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 e8ec912cee647c56dde65acfeaeeeec32aef2d4a..d3a4b01234f2dc458044ec4f4d55eb54236f8ef5 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -219,6 +219,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index 14d93448e906ea1105df7c68cb493389cd2147f4..a863a6052d71f9d28e0ed974dd1155c1a5f820e3 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -171,6 +171,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index 3c842d3642f6634f50f836f891b942a6c582ba1f..ab72b7ffeb2fce58d5cae8188f0829d44708bd97 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -169,6 +169,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index 7691d1d76277ecdff13015b0d9eb80f805333c37..051b7d43a8cd01d827be95fe14a858232ec7042f 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -135,6 +135,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index f6911b06b3039b70b5a71ce2f36bcc6b4e063753..41a54985d77dce49cf675667d40252234c1c8877 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -213,6 +213,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 d59772cbf64d6085e95fe4563321c1762052dbe9..90acb2977568e9d082bb734b703409e8f5e6f797 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -214,6 +214,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 7a0ee2685465cbf993e373d0d2e9c6ca5544d799..768cba5a41c091d97f8ab91f03162166402cedc7 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -220,6 +220,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index ca66634456e07abfc85e166790878bd87d675344..61eab9de0ef28bd9f231001015e52952772d8c29 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -172,6 +172,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index 7c2d0c6120945d7c0ec8be8d059dc2150dea9a11..fa722b5fd388c0582d1d321b6222da5998983bce 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -170,6 +170,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 3255765c75b09640e7f023d9376b7b85e19d4dea..7a95c530f90f615a563b9c2d29979ae43259f11c 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -214,6 +214,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 86fdf9b884af33d25a06eb999fc5d1aefcf8e58b..f4d0fcf67308f6f34eadc946be89ca6ed3d3b478 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -215,6 +215,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 034273c84702402bfd20e321bf6d959d8f34ea66..2c761fc1afce2e814547b45facf58c59ac23946d 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -220,6 +220,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 4a943c4f362910faf2da70b529ea007c65e50a05..67fc449f5dacda3137b648dd08eba9d7e105ab1d 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -215,6 +215,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 52819a95323d6abb46f2f33934a45fb1fb2ff22f..9d68c0a404bbf7207bda175236597008315f294b 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -215,6 +215,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

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 7d14e5325566967f653b3e20be7348fbe65e86e5..8db840faac9e543f4425627991fa04290c29c4e6 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -221,6 +221,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index 665f7e568f892cca24ef5d2af8203e205d3fb352..f6045623f5fa27055223e8bd05223c635f4751d1 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -174,6 +174,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index e1005392e16bdc8bb8b7e15ed4ac780b108206d7..35e18adcd5c5bca442277990a25f779736254af2 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -172,6 +172,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index 720d6ad8852e908bf86d75f9509932bf88abddd4..8fed9d30b7c32c4d2020eeaa73c3e499c3037f51 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -133,6 +133,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index beb473cd73e969d0a41524a23b14cb09a89c8b36..0f89790b60e232c679607e5fc5ac001d46868e1e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -215,6 +215,7 @@
       </enum>
       <enum name='backendModel'>
         <value>passthrough</value>
+        <value>emulator</value>
       </enum>
     </tpm>
   </devices>

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 4a46acb9ad535f068efdc6077672131cc0bd5e2f..479bcb1c35441c4cf831b9d0c126fafd284a8445 100644 (file)
--- 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 */
+bool virTPMHasSwtpm(void)
+{
+    return true;
+}
+
 #endif /* WITH_QEMU */