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

qemu: capabilities: Remove return value from virQEMUCapsAccelCopy

The function now always returns 0.

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 5d3ab3b958..9907d80555 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1959,7 +1959,7 @@ virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccel *dst,
 }
 
 
-static int
+static void
 virQEMUCapsAccelCopy(virQEMUCapsAccel *dst,
                      virQEMUCapsAccel *src)
 {
@@ -1968,8 +1968,6 @@ virQEMUCapsAccelCopy(virQEMUCapsAccel *dst,
     virQEMUCapsHostCPUDataCopy(&dst->hostCPU, &src->hostCPU);
 
     dst->cpuModels = qemuMonitorCPUDefsCopy(src->cpuModels);
-
-    return 0;
 }
 
 
@@ -1998,10 +1996,9 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
     ret->arch = qemuCaps->arch;
     ret->cpuData = virCPUDataNewCopy(qemuCaps->cpuData);
 
-    if (virQEMUCapsAccelCopy(&ret->kvm, &qemuCaps->kvm) < 0 ||
-        virQEMUCapsAccelCopy(&ret->hvf, &qemuCaps->hvf) < 0 ||
-        virQEMUCapsAccelCopy(&ret->tcg, &qemuCaps->tcg) < 0)
-        return NULL;
+    virQEMUCapsAccelCopy(&ret->kvm, &qemuCaps->kvm);
+    virQEMUCapsAccelCopy(&ret->hvf, &qemuCaps->hvf);
+    virQEMUCapsAccelCopy(&ret->tcg, &qemuCaps->tcg);
 
     ret->gicCapabilities = g_new0(virGICCapability, qemuCaps->ngicCapabilities);
     ret->ngicCapabilities = qemuCaps->ngicCapabilities;