From e90a643c90af66ce146f426861dc9a226c1caf62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 8 Jan 2020 18:17:58 +0000 Subject: [PATCH] tests: avoid probing host CPU from bhyve test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Daniel P. Berrangé --- src/cpu/cpu.h | 2 +- tests/bhyveargv2xmlmock.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 13909bb7a4..2e8b8923ae 100644 --- 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 1f08bebb7b..8120be29c1 100644 --- 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); +}