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

hypervisor: Drop dead code in virDomainCgroupSetupGlobalCpuCgroup()

Browse Source 
Since its introduction in v1.3.2-43-gef1fa55e46 there is a dead
code in virDomainCgroupSetupGlobalCpuCgroup() (well,
qemuSetupGlobalCpuCgroup() back then). The code formats NUMA
nodeset but never sets it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-04-01 13:14:59 +02:00
parent cc4542e5d3
commit 85a6474907
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ch/ch_process.c
View File

@ -526,8 +526,7 @@ virCHProcessStart(virCHDriver *driver,
VIR_DEBUG("Setting global CPU cgroup (if required)"); VIR_DEBUG("Setting global CPU cgroup (if required)");
if (virDomainCgroupSetupGlobalCpuCgroup(vm, if (virDomainCgroupSetupGlobalCpuCgroup(vm,
priv->cgroup, priv->cgroup) < 0)
priv->autoNodeset) < 0)
goto cleanup; goto cleanup;
VIR_DEBUG("Setting vCPU tuning/settings"); VIR_DEBUG("Setting vCPU tuning/settings");

21
src/hypervisor/domain_cgroup.c
View File

@ -572,13 +572,10 @@ virDomainCgroupSetupCpusetCpus(virCgroup *cgroup,
int int
virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm, virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm,
virCgroup *cgroup, virCgroup *cgroup)
virBitmap *autoNodeset)
{ {
unsigned long long period = vm->def->cputune.global_period; unsigned long long period = vm->def->cputune.global_period;
long long quota = vm->def->cputune.global_quota; long long quota = vm->def->cputune.global_quota;
g_autofree char *mem_mask = NULL;
virDomainNumatuneMemMode mem_mode;
if ((period || quota) && if ((period || quota) &&
!virCgroupHasController(cgroup, VIR_CGROUP_CONTROLLER_CPU)) { !virCgroupHasController(cgroup, VIR_CGROUP_CONTROLLER_CPU)) {
@ -587,22 +584,6 @@ virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm,
return -1; return -1;
} }
/*
* If CPU cgroup controller is not initialized here, then we need
* neither period nor quota settings. And if CPUSET controller is
* not initialized either, then there's nothing to do anyway.
*/
if (!virCgroupHasController(cgroup, VIR_CGROUP_CONTROLLER_CPU) &&
!virCgroupHasController(cgroup, VIR_CGROUP_CONTROLLER_CPUSET))
return 0;
if (virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 &&
mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT &&
virDomainNumatuneMaybeFormatNodeset(vm->def->numa,
autoNodeset, &mem_mask, -1) < 0)
return -1;
if (virDomainCgroupSetupVcpuBW(cgroup, period, quota) < 0) if (virDomainCgroupSetupVcpuBW(cgroup, period, quota) < 0)
return -1; return -1;

3
src/hypervisor/domain_cgroup.h
View File

@ -98,8 +98,7 @@ virDomainCgroupSetupCpusetCpus(virCgroup *cgroup,
virBitmap *cpumask); virBitmap *cpumask);
int int
virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm, virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm,
virCgroup *cgroup, virCgroup *cgroup);
virBitmap *autoNodeset);
int int
virDomainCgroupRemoveCgroup(virDomainObj *vm, virDomainCgroupRemoveCgroup(virDomainObj *vm,
virCgroup *cgroup, virCgroup *cgroup,

2
src/qemu/qemu_process.c
View File

@ -7637,7 +7637,7 @@ qemuProcessLaunch(virConnectPtr conn,
goto cleanup; goto cleanup;
VIR_DEBUG("Setting global CPU cgroup (if required)"); VIR_DEBUG("Setting global CPU cgroup (if required)");
if (virDomainCgroupSetupGlobalCpuCgroup(vm, priv->cgroup, priv->autoNodeset) < 0) if (virDomainCgroupSetupGlobalCpuCgroup(vm, priv->cgroup) < 0)
goto cleanup; goto cleanup;
VIR_DEBUG("Setting vCPU tuning/settings"); VIR_DEBUG("Setting vCPU tuning/settings");