External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Remove return value from virCPUDefCopyModel(Filter)

Browse Source 
The functions were always returning 0.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-03 10:04:47 +01:00
parent 9c627dc762
commit 8432392f51
9 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conf/cpu_conf.c
View File

@ -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);
}

4
src/conf/cpu_conf.h
View File

@ -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,

3
src/cpu/cpu_arm.c
View File

@ -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;

3
src/cpu/cpu_s390.c
View File

@ -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,

11
src/cpu/cpu_x86.c
View File

@ -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);
}

10
src/qemu/qemu_capabilities.c
View File

@ -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),

10
src/qemu/qemu_domain.c
View File

@ -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);

9
src/qemu/qemu_driver.c
View File

@ -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,

8
src/qemu/qemu_process.c
View File

@ -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;