tests: avoid probing host CPU from bhyve test

bhyveargv2xmlmock calls virBhyveCapsBuild which in turn
calls virCPUProbeHost, probing the real host CPU. This
causes a test failure if the host CPU happens to contain
the 'arch-capabilities' feature as it triggers a call
to virHostCPUGetMSR() which fails on FreeBSD.

Fortunately we already have convenient code for mocking
the host CPU probing.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 13909bb7a44558972cb99166cb2c0b7a65cb72dc..2e8b8923ae23784b900c372c59c67847c974802a 100644 (file)
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -193,7 +193,7 @@ virCPUGetHost(virArch arch,
               virDomainCapsCPUModelsPtr models);
 
 virCPUDefPtr
-virCPUProbeHost(virArch arch);
+virCPUProbeHost(virArch arch) G_GNUC_NO_INLINE;
 
 virCPUDefPtr
 virCPUBaseline(virArch arch,

diff --git a/tests/bhyveargv2xmlmock.c b/tests/bhyveargv2xmlmock.c
index 1f08bebb7b4b3bddda63b63b6293276172bc90cd..8120be29c1f6b8a712f06ba64ce6e33fa8864c60 100644 (file)
--- a/tests/bhyveargv2xmlmock.c
+++ b/tests/bhyveargv2xmlmock.c
@@ -2,7 +2,9 @@
 
 #include "virnetdev.h"
 #include "internal.h"
+#include "testutilshostcpus.h"
 #include "util/viruuid.h"
+#include "cpu/cpu.h"
 
 #define VIR_FROM_THIS VIR_FROM_BHYVE
 
@@ -25,3 +27,9 @@ virUUIDGenerate(unsigned char *uuid)
         return -1;
     return 0;
 }
+
+virCPUDefPtr
+virCPUProbeHost(virArch arch)
+{
+    return testUtilsHostCpusGetDefForArch(arch);
+}