From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 28 Aug 2018 14:04:13 +0000 (+0200)
Subject: tests: Properly reset mocked CPU model
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d8313d3cf215ee607a4e351afe0cb71402d515ac;p=libvirt.git

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 <jdenemar@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

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;
 }