testQemuGetRealCaps: Strip the default machine alias before insertion into cache

Expand the default machine type alias of the 'latest' capabilities for
an architecture before caching it rather than after copying it, so that
we don't duplicate the work all the time.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index b75241d5456f0b42ba5dc4f3b6fe689bb4a6c4ad..40c2cb8bba15b725c6a3027ffd3bbdde56f1a567 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -931,14 +931,14 @@ testQemuGetRealCaps(const char *arch,
             return NULL;
         }
 
+        if (stripmachinealiases)
+            virQEMUCapsStripMachineAliases(cachedcaps);
+
         g_hash_table_insert(capsCache, g_strdup(capsfile), cachedcaps);
     }
 
     ret = virQEMUCapsNewCopy(cachedcaps);
 
-    if (stripmachinealiases)
-        virQEMUCapsStripMachineAliases(ret);
-
     /* strip 'xml' suffix so that we can format the file to '.replies' */
     capsfile[strlen(capsfile) - 3] = '\0';