From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 3 Mar 2023 09:38:50 +0000 (+0100)
Subject: qemu: Remove return value checks from calls to virQEMUCapsNewCopy
X-Git-Tag: v9.2.0-rc1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b048218a8a4527683b655d757e555db60bef03c7;p=thirdparty%2Flibvirt.git

qemu: Remove return value checks from calls to virQEMUCapsNewCopy

The function now can't fail.

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

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9907d80555..8788996f21 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6074,9 +6074,6 @@ virQEMUCapsCacheLookupCopy(virFileCache *cache,
     ret = virQEMUCapsNewCopy(qemuCaps);
     virObjectUnref(qemuCaps);
 
-    if (!ret)
-        return NULL;
-
     virQEMUCapsFilterByMachineType(ret, virtType, machineType);
     return ret;
 }
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 58beeb48cb..5be37a8380 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -150,8 +150,7 @@ testQemuCapsCopy(const void *opaque)
               virArchFromString(data->archName), capsFile)))
         return -1;
 
-    if (!(copy = virQEMUCapsNewCopy(orig)))
-        return -1;
+    copy = virQEMUCapsNewCopy(orig);
 
     if (!(actual = virQEMUCapsFormatCache(copy)))
         return -1;
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 672cef9f95..d88b21b987 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -517,9 +517,7 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache,
             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;
-
+                    copyCaps = effCaps = virQEMUCapsNewCopy(caps);
                     qemuTestCapsPopulateFakeMachines(copyCaps, arch, hostOS);
                 }
 
@@ -541,9 +539,6 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache,
             else
                 tmp = virQEMUCapsNew();
 
-            if (!tmp)
-                return -1;
-
             qemuTestCapsPopulateFakeMachines(tmp, i, hostOS);
 
             if (qemuTestCapsCacheInsertData(cache, qemu_emulators[i], tmp) < 0)
@@ -1040,8 +1035,7 @@ testQemuInfoInitArgs(struct testQemuInfo *info)
             g_hash_table_insert(info->conf->capscache, g_strdup(capsfile), cachedcaps);
         }
 
-        if (!(info->qemuCaps = virQEMUCapsNewCopy(cachedcaps)))
-            return -1;
+        info->qemuCaps = virQEMUCapsNewCopy(cachedcaps);
 
         if (info->args.fakeCapsUsed) {
             size_t i;