From 6ba02c21acf4764e764ddb0a373efa1adc6b037a Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 11 Nov 2015 10:28:47 +0100 Subject: [PATCH] qemu: cgroup: Remove now unreachable check Since commit 0c04906fa the check for priv->cgroup doesn't make sense as the calls to virCgroupHasController return the same information. Remove it and move it's comment partially to the new check. The already spurious check was also later copied to the iothreads code. --- src/qemu/qemu_cgroup.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index b52ce3ae5..95a8e66e2 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1018,18 +1018,13 @@ qemuSetupCgroupForVcpu(virDomainObjPtr vm) /* * 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. + * not initialized either, then there's nothing to do anyway. CPU pinning + * will be set via virProcessSetAffinity. */ if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU) && !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) return 0; - /* We are trying to setup cgroups for CPU pinning, which can also be done - * with virProcessSetAffinity, thus the lack of cgroups is not fatal here. - */ - if (priv->cgroup == NULL) - return 0; - if (priv->nvcpupids == 0 || priv->vcpupids[0] == vm->pid) { /* If we don't know VCPU<->PID mapping or all vcpu runs in the same * thread, we cannot control each vcpu. @@ -1129,9 +1124,6 @@ qemuSetupCgroupForEmulator(virDomainObjPtr vm) !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) return 0; - if (priv->cgroup == NULL) - return 0; /* Not supported, so claim success */ - if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_EMULATOR, 0, true, &cgroup_emulator) < 0) goto cleanup; @@ -1202,12 +1194,6 @@ qemuSetupCgroupForIOThreads(virDomainObjPtr vm) !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) return 0; - /* We are trying to setup cgroups for CPU pinning, which can also be done - * with virProcessSetAffinity, thus the lack of cgroups is not fatal here. - */ - if (priv->cgroup == NULL) - return 0; - if (virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 && mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT && virDomainNumatuneMaybeFormatNodeset(vm->def->numa, -- 2.39.5