From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 3 Jul 2023 12:41:38 +0000 (+0200)
Subject: testQemuGetRealCaps: Strip the default machine alias before insertion into cache
X-Git-Tag: v9.6.0-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5ddd072bcd8219aa49b37b565934899fbc00f8a;p=thirdparty%2Flibvirt.git

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 b75241d545..40c2cb8bba 100644
--- 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';