hypervisor: Drop dead code in virDomainCgroupSetupGlobalCpuCgroup()

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>

diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c
index 00d94ddcbeb21bc10b3466d28bf8e8aa76465c96..785e4f87692078b0a4de41077fb0777c29d2c7ec 100644 (file)
--- a/src/ch/ch_process.c
+++ b/src/ch/ch_process.c
@@ -526,8 +526,7 @@ virCHProcessStart(virCHDriver *driver,
 
     VIR_DEBUG("Setting global CPU cgroup (if required)");
     if (virDomainCgroupSetupGlobalCpuCgroup(vm,
-                                            priv->cgroup,
-                                            priv->autoNodeset) < 0)
+                                            priv->cgroup) < 0)
         goto cleanup;
 
     VIR_DEBUG("Setting vCPU tuning/settings");

diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c
index 920ec8c895b94330d835b2b62c3c7d7e24e870a6..5af88155bcd3f91e34926928fb1e24d1d9b1b524 100644 (file)
--- a/src/hypervisor/domain_cgroup.c
+++ b/src/hypervisor/domain_cgroup.c
@@ -572,13 +572,10 @@ virDomainCgroupSetupCpusetCpus(virCgroup *cgroup,
 
 int
 virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm,
-                                    virCgroup *cgroup,
-                                    virBitmap *autoNodeset)
+                                    virCgroup *cgroup)
 {
     unsigned long long period = vm->def->cputune.global_period;
     long long quota = vm->def->cputune.global_quota;
-    g_autofree char *mem_mask = NULL;
-    virDomainNumatuneMemMode mem_mode;
 
     if ((period || quota) &&
         !virCgroupHasController(cgroup, VIR_CGROUP_CONTROLLER_CPU)) {
@@ -587,22 +584,6 @@ virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm,
         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)
         return -1;
 

diff --git a/src/hypervisor/domain_cgroup.h b/src/hypervisor/domain_cgroup.h
index 20893e1b46bba7386b5662e53aad4235eb5259b2..f8d261a080c318fa7b3c9f18aa0e167bb16e9de4 100644 (file)
--- a/src/hypervisor/domain_cgroup.h
+++ b/src/hypervisor/domain_cgroup.h
@@ -98,8 +98,7 @@ virDomainCgroupSetupCpusetCpus(virCgroup *cgroup,
                                virBitmap *cpumask);
 int
 virDomainCgroupSetupGlobalCpuCgroup(virDomainObj *vm,
-                                    virCgroup *cgroup,
-                                    virBitmap *autoNodeset);
+                                    virCgroup *cgroup);
 int
 virDomainCgroupRemoveCgroup(virDomainObj *vm,
                             virCgroup *cgroup,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index b1c506a552885f04529c0dd34019a9f8a2d067e1..07f1045490e6c36efcd37bf0bcc382baaf6757d6 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7637,7 +7637,7 @@ qemuProcessLaunch(virConnectPtr conn,
         goto cleanup;
 
     VIR_DEBUG("Setting global CPU cgroup (if required)");
-    if (virDomainCgroupSetupGlobalCpuCgroup(vm, priv->cgroup, priv->autoNodeset) < 0)
+    if (virDomainCgroupSetupGlobalCpuCgroup(vm, priv->cgroup) < 0)
         goto cleanup;
 
     VIR_DEBUG("Setting vCPU tuning/settings");