tests: mock swtpm initialization for all qemu tests

Don't restrict this to domcaps testing only, we will soon
need it for qemu command line validation

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index da5c629fd42b7f2b80c754d6fcce043fabe309bb..3b8216a8f66b51c21a8034dc50b378510cce09ba 100644 (file)
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -22,7 +22,6 @@
 #include "domain_capabilities.h"
 #include "virfilewrapper.h"
 #include "configmake.h"
-#include "virtpm.h"
 
 
 #define VIR_FROM_THIS VIR_FROM_NONE
@@ -129,12 +128,6 @@ fillQemuCaps(virDomainCaps *domCaps,
 }
 
 
-/* Enough to tell capabilities code that swtpm is usable */
-bool virTPMHasSwtpm(void)
-{
-    return true;
-}
-
 #endif /* WITH_QEMU */
 
 

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index d26caba5fb2830b232afdff3aca3d018ecda697d..6dabbaf36ab5b148863a602c58eca709de492122 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -11,6 +11,7 @@
 # include "qemu/qemu_capspriv.h"
 # include "virstring.h"
 # include "virfilecache.h"
+# include "virtpm.h"
 
 # include <sys/types.h>
 # include <fcntl.h>
@@ -138,6 +139,13 @@ virFindFileInPath(const char *file)
 }
 
 
+/* Enough to tell capabilities code that swtpm is usable */
+bool virTPMHasSwtpm(void)
+{
+    return true;
+}
+
+
 virCapsHostNUMA *
 virCapabilitiesHostNUMANewHost(void)
 {