From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 2 Mar 2023 16:59:09 +0000 (+0100)
Subject: qemuTestCapsCacheInsert*: Directly insert real capabilities
X-Git-Tag: v9.2.0-rc1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5810eb97ad5845d0df9dbfbd91799e2c7614e064;p=thirdparty%2Flibvirt.git

qemuTestCapsCacheInsert*: Directly insert real capabilities

Real capabilities populate the binary name, while fake don't. We can
directly insert the capabilities using the real binary name.

This will allow to remove 'qemu_emulators' entries once all tests are
converted to real capabilties.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index e15130492e..8738b69c84 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -533,24 +533,30 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache,
          *
          * before populating the cache;
          */
-        virArch arch = virQEMUCapsGetArch(caps);
-        g_autoptr(virQEMUCaps) copyCaps = NULL;
-        virQEMUCaps *effCaps = caps;
+        /* caps->binary is populated only for real capabilities */
+        if (virQEMUCapsGetBinary(caps)) {
+            if (qemuTestCapsCacheInsertData(cache, virQEMUCapsGetBinary(caps), caps) < 0)
+                return -1;
+        } else {
+            virArch arch = virQEMUCapsGetArch(caps);
+            g_autoptr(virQEMUCaps) copyCaps = NULL;
+            virQEMUCaps *effCaps = caps;
 
-        if (arch_alias[arch] != VIR_ARCH_NONE)
-            arch = arch_alias[arch];
+            if (arch_alias[arch] != VIR_ARCH_NONE)
+                arch = arch_alias[arch];
 
-        if (qemu_emulators[arch]) {
-            /* if we are dealing with fake caps we need to populate machine types */
-            if (!virQEMUCapsHasMachines(caps)) {
-                if (!(copyCaps = effCaps = virQEMUCapsNewCopy(caps)))
-                    return -1;
+            if (qemu_emulators[arch]) {
+                /* if we are dealing with fake caps we need to populate machine types */
+                if (!virQEMUCapsHasMachines(caps)) {
+                    if (!(copyCaps = effCaps = virQEMUCapsNewCopy(caps)))
+                        return -1;
 
-                qemuTestCapsPopulateFakeMachines(copyCaps, arch, hostOS);
-            }
+                    qemuTestCapsPopulateFakeMachines(copyCaps, arch, hostOS);
+                }
 
-            if (qemuTestCapsCacheInsertData(cache, qemu_emulators[arch], effCaps) < 0)
-                return -1;
+                if (qemuTestCapsCacheInsertData(cache, qemu_emulators[arch], effCaps) < 0)
+                    return -1;
+            }
         }
     } else {
         /* in case when caps are missing or are missing architecture, we populate