cpu: Remove return value from virCPUDefCopyModel(Filter)

The functions were always returning 0.

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

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index a33f39ef3117be73a383b4d3398dd6f63e97ad04..1227db1201a08c13f9bc6b563b1131b0d34b51c7 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -140,16 +140,16 @@ virCPUDefFree(virCPUDef *def)
 }
 
 
-int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
+void ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
 virCPUDefCopyModel(virCPUDef *dst,
                    const virCPUDef *src,
                    bool resetPolicy)
 {
-    return virCPUDefCopyModelFilter(dst, src, resetPolicy, NULL, NULL);
+    virCPUDefCopyModelFilter(dst, src, resetPolicy, NULL, NULL);
 }
 
 
-int
+void
 virCPUDefCopyModelFilter(virCPUDef *dst,
                          const virCPUDef *src,
                          bool resetPolicy,
@@ -185,8 +185,6 @@ virCPUDefCopyModelFilter(virCPUDef *dst,
 
         dst->features[n].name = g_strdup(src->features[i].name);
     }
-
-    return 0;
 }
 
 
@@ -281,8 +279,7 @@ virCPUDefCopy(const virCPUDef *cpu)
     if (!(copy = virCPUDefCopyWithoutModel(cpu)))
         return NULL;
 
-    if (virCPUDefCopyModel(copy, cpu, false) < 0)
-        return NULL;
+    virCPUDefCopyModel(copy, cpu, false);
 
     return g_steal_pointer(&copy);
 }

diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 113d3497083a31515f1cee57c9f868994e6e95aa..5d69b4d2e088fcd6f3cc5fad37f5e85d498e97ac 100644 (file)
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -175,7 +175,7 @@ void
 virCPUDefFree(virCPUDef *def);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUDef, virCPUDefFree);
 
-int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
+void ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
 virCPUDefCopyModel(virCPUDef *dst,
                    const virCPUDef *src,
                    bool resetPolicy);
@@ -187,7 +187,7 @@ typedef bool (*virCPUDefFeatureFilter)(const char *name,
                                        virCPUFeaturePolicy policy,
                                        void *opaque);
 
-int
+void
 virCPUDefCopyModelFilter(virCPUDef *dst,
                          const virCPUDef *src,
                          bool resetPolicy,

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index 3ec06edef416add5f1c20751261f8071315b3bff..a890ed6ba3157b936384f28418c74404d94bb1c3 100644 (file)
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -465,8 +465,7 @@ virCPUarmUpdate(virCPUDef *guest,
         return -1;
 
     updated->mode = VIR_CPU_MODE_CUSTOM;
-    if (virCPUDefCopyModel(updated, host, true) < 0)
-        return -1;
+    virCPUDefCopyModel(updated, host, true);
 
     virCPUDefStealModel(guest, updated, false);
     guest->mode = VIR_CPU_MODE_CUSTOM;

diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index 81a1513ecb68205a24c1f3a72cb1d6a5e4b583b7..0f3b5c6820134e43a0cc19a8558d4fb33503d139 100644 (file)
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -72,8 +72,7 @@ virCPUs390Update(virCPUDef *guest,
         return -1;
 
     updated->mode = VIR_CPU_MODE_CUSTOM;
-    if (virCPUDefCopyModel(updated, host, true) < 0)
-        return -1;
+    virCPUDefCopyModel(updated, host, true);
 
     for (i = 0; i < guest->nfeatures; i++) {
        if (virCPUDefUpdateFeature(updated,

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index c6323ce8c7ee900f73fc95a1409a62867cab4140..2fede8e5faee6d60a8aef290ee1b1e6717c28986 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2943,8 +2943,7 @@ x86UpdateHostModel(virCPUDef *guest,
 
     updated->type = VIR_CPU_TYPE_GUEST;
     updated->mode = VIR_CPU_MODE_CUSTOM;
-    if (virCPUDefCopyModel(updated, host, true) < 0)
-        return -1;
+    virCPUDefCopyModel(updated, host, true);
 
     if (guest->vendor_id) {
         g_free(updated->vendor_id);
@@ -3257,7 +3256,9 @@ virCPUx86ExpandFeatures(virCPUDef *cpu)
 
     virCPUDefFreeModel(cpu);
 
-    return virCPUDefCopyModel(cpu, expanded, false);
+    virCPUDefCopyModel(cpu, expanded, false);
+
+    return 0;
 }
 
 
@@ -3282,9 +3283,7 @@ virCPUx86CopyMigratable(virCPUDef *cpu)
     if (!(copy = virCPUDefCopyWithoutModel(cpu)))
         return NULL;
 
-    if (virCPUDefCopyModelFilter(copy, cpu, false,
-                                 x86FeatureFilterMigratable, map) < 0)
-        return NULL;
+    virCPUDefCopyModelFilter(copy, cpu, false, x86FeatureFilterMigratable, map);
 
     return g_steal_pointer(&copy);
 }

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8649434be8d87a102a80d8b6e8ad558cf2e47628..376b2c5458cc68154e3e070a888de4f830d8662a 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3871,13 +3871,11 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps,
         VIR_DEBUG("No host CPU model info from QEMU; probing host CPU directly");
 
         cpuModels = virQEMUCapsGetCPUModels(qemuCaps, type, NULL, NULL);
-        hostCPU = virQEMUCapsProbeHostCPU(hostArch, cpuModels);
-
-        if (!hostCPU ||
-            virCPUDefCopyModelFilter(cpu, hostCPU, true,
-                                     virQEMUCapsCPUFilterFeatures,
-                                     &qemuCaps->arch) < 0)
+        if (!(hostCPU = virQEMUCapsProbeHostCPU(hostArch, cpuModels)))
             goto error;
+
+        virCPUDefCopyModelFilter(cpu, hostCPU, true, virQEMUCapsCPUFilterFeatures,
+                                 &qemuCaps->arch);
     } else if (rc == 2) {
         VIR_DEBUG("QEMU does not provide CPU model for arch=%s virttype=%s",
                   virArchToString(qemuCaps->arch),

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a7bffe1bc21cc515794c67c1a7eb4db33a79b224..8e65a0f9b71a7c374f28e590db4cf05951f3152a 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -10825,9 +10825,8 @@ qemuDomainFixupCPUs(virDomainObj *vm,
         if (!fixedCPU)
             return -1;
 
-        if (virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false,
-                                     virQEMUCapsCPUFilterFeatures, &arch) < 0)
-            return -1;
+        virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false,
+                                 virQEMUCapsCPUFilterFeatures, &arch);
 
         virCPUDefFree(vm->def->cpu);
         vm->def->cpu = g_steal_pointer(&fixedCPU);
@@ -10839,9 +10838,8 @@ qemuDomainFixupCPUs(virDomainObj *vm,
         if (!fixedOrig)
             return -1;
 
-        if (virCPUDefCopyModelFilter(fixedOrig, *origCPU, false,
-                                     virQEMUCapsCPUFilterFeatures, &arch) < 0)
-            return -1;
+        virCPUDefCopyModelFilter(fixedOrig, *origCPU, false,
+                                 virQEMUCapsCPUFilterFeatures, &arch);
 
         virCPUDefFree(*origCPU);
         *origCPU = g_steal_pointer(&fixedOrig);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 00158538328697769f170b05f42804e12c141d4f..6d117c090a5e161bee4f8021fd474bf51289dd78 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12174,10 +12174,8 @@ qemuConnectBaselineCPU(virConnectPtr conn G_GNUC_UNUSED,
     if (!(cpu = virCPUDefCopyWithoutModel(baseline)))
         goto cleanup;
 
-    if (virCPUDefCopyModelFilter(cpu, baseline, false,
-                                 virQEMUCapsCPUFilterFeatures,
-                                 &cpus[0]->arch) < 0)
-        goto cleanup;
+    virCPUDefCopyModelFilter(cpu, baseline, false, virQEMUCapsCPUFilterFeatures,
+                             &cpus[0]->arch);
 
     if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&
         virCPUExpandFeatures(cpus[0]->arch, cpu) < 0)
@@ -12273,8 +12271,7 @@ qemuConnectCPUModelBaseline(virQEMUCaps *qemuCaps,
 
     baseline = g_new0(virCPUDef, 1);
 
-    if (virCPUDefCopyModel(baseline, cpus[0], false) < 0)
-        return NULL;
+    virCPUDefCopyModel(baseline, cpus[0], false);
 
     for (i = 1; i < ncpus; i++) {
         if (qemuMonitorGetCPUModelBaseline(proc->mon, baseline,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1b22e1bad45feda349a4978e4a1e07a3d928825a..60a2e244115c67473968779b261e7286dd86c352 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8829,12 +8829,12 @@ qemuProcessRefreshCPU(virQEMUDriver *driver,
         if (!(hostmig = virCPUCopyMigratable(host->arch, host)))
             return -1;
 
-        if (!(cpu = virCPUDefCopyWithoutModel(hostmig)) ||
-            virCPUDefCopyModelFilter(cpu, hostmig, false,
-                                     virQEMUCapsCPUFilterFeatures,
-                                     &host->arch) < 0)
+        if (!(cpu = virCPUDefCopyWithoutModel(hostmig)))
             return -1;
 
+        virCPUDefCopyModelFilter(cpu, hostmig, false, virQEMUCapsCPUFilterFeatures,
+                                 &host->arch);
+
         if (virCPUUpdate(vm->def->os.arch, vm->def->cpu, cpu) < 0)
             return -1;