From d8313d3cf215ee607a4e351afe0cb71402d515ac Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Tue, 28 Aug 2018 16:04:13 +0200 Subject: [PATCH] tests: Properly reset mocked CPU model When switching the host architecture to something for which we do not have any host CPU model defined, the mocked virQEMUCapsProbeHostCPUForEmulator would just return the previous CPU model resulting in strange combinations, such as "core2duo" host CPU model in QEMU capabilities for "AArch64" architecture. It currently doesn't break any test case, but we should fix it anyway to avoid future surprises which would be quite hard to debug. Signed-off-by: Jiri Denemark Reviewed-by: Erik Skultety --- tests/testutilsqemu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8438613f28..70bed461b5 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -569,12 +569,11 @@ qemuTestSetHostCPU(virCapsPtr caps, cpu = cpuPower8; } + unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); if (cpu) { caps->host.arch = cpu->arch; if (cpu->model) setenv("VIR_TEST_MOCK_FAKE_HOST_CPU", cpu->model, 1); - else - unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); } caps->host.cpu = cpu; }