[PATCH 16/21] qemuxml2argvtest: Don't insert capabilities into cache twice

[Peter Krempa]

Fake capabilities are inserted twice, as in a few tests the architecture
is not present in the XML (testing filling in of the architecture).
Since we already know which architecture will be picked we don't need to
be adding the capabilities twice.

This doesn't impact the tests as they use the same approach to determine
the default arch.

Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
 tests/qemuxml2argvtest.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b5e10bb4f0..127f050058 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -760,11 +760,11 @@ testCompareXMLToArgv(const void *data)

     ctxt->node = root;

-    if ((archstr = virXPathString("string(./os/type[1]/@arch)", ctxt))) {
-        if ((arch = virArchFromString(archstr)) == VIR_ARCH_NONE) {
-            arch = virArchFromHost();
-        }
-    }
+    if ((archstr = virXPathString("string(./os/type[1]/@arch)", ctxt)))
+        arch = virArchFromString(archstr);
+
+    if (arch == VIR_ARCH_NONE)
+        arch = virArchFromHost();

     if (!(info->flags & FLAG_REAL_CAPS)) {
         if (testUpdateQEMUCaps(info, arch, driver.caps) < 0)
@@ -823,13 +823,6 @@ testCompareXMLToArgv(const void *data)
     if (qemuProcessPrepareMonitorChr(&monitor_chr, priv->libDir) < 0)
         goto cleanup;

-    if (!(info->flags & FLAG_REAL_CAPS)) {
-        if (testUpdateQEMUCaps(info, vm->def->os.arch, driver.caps) < 0)
-            goto cleanup;
-        if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
-            goto cleanup;
-    }
-
     virResetLastError();

     if (!(cmd = testCompareXMLToArgvCreateArgs(&driver, vm, migrateURI, info,
-- 
2.31.1