[PATCH 03/10] testQemuGetRealCaps: Strip the default machine alias before insertion into cache

Peter Krempa pkrempa at redhat.com
Tue Jul 4 13:40:12 UTC 2023


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 at redhat.com>
---
 tests/testutilsqemu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

-- 
2.41.0



More information about the libvir-list mailing list