From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 3 Mar 2023 09:34:58 +0000 (+0100)
Subject: qemu: capabilities: Remove return value from virQEMUCapsHostCPUDataCopy
X-Git-Tag: v9.2.0-rc1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07177f6df7b3c2a0c0f3267a6c979491953dd479;p=thirdparty%2Flibvirt.git

qemu: capabilities: Remove return value from virQEMUCapsHostCPUDataCopy

The function can't fail at this point. Remove the last outstanding
pointless error check and turn the return type into 'void'.

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 9cc8d99994..5d3ab3b958 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1848,13 +1848,12 @@ virQEMUCapsNewBinary(const char *binary)
 }
 
 
-static int
+static void
 virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUData *dst,
                            virQEMUCapsHostCPUData *src)
 {
-    if (src->info &&
-        !(dst->info = qemuMonitorCPUModelInfoCopy(src->info)))
-        return -1;
+    if (src->info)
+        dst->info = qemuMonitorCPUModelInfoCopy(src->info);
 
     if (src->reported)
         dst->reported = virCPUDefCopy(src->reported);
@@ -1864,8 +1863,6 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUData *dst,
 
     if (src->full)
         dst->full = virCPUDefCopy(src->full);
-
-    return 0;
 }
 
 
@@ -1968,8 +1965,7 @@ virQEMUCapsAccelCopy(virQEMUCapsAccel *dst,
 {
     virQEMUCapsAccelCopyMachineTypes(dst, src);
 
-    if (virQEMUCapsHostCPUDataCopy(&dst->hostCPU, &src->hostCPU) < 0)
-        return -1;
+    virQEMUCapsHostCPUDataCopy(&dst->hostCPU, &src->hostCPU);
 
     dst->cpuModels = qemuMonitorCPUDefsCopy(src->cpuModels);