1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00

qemu: cgroup: Kill qemuSetupCgroupVcpuPin()

The function doesn't make sense. There's a simpler way to achieve the
same.
This commit is contained in:
Peter Krempa 2015-03-27 13:51:17 +01:00
parent 8a81264b18
commit 6afb0d04fe
3 changed files with 3 additions and 25 deletions

View File

@ -942,22 +942,6 @@ qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
return -1;
}
int
qemuSetupCgroupVcpuPin(virCgroupPtr cgroup,
virDomainPinDefPtr *vcpupin,
int nvcpupin,
int vcpuid)
{
size_t i;
for (i = 0; i < nvcpupin; i++) {
if (vcpuid == vcpupin[i]->id)
return qemuSetupCgroupCpusetCpus(cgroup, vcpupin[i]->cpumask);
}
return -1;
}
int
qemuSetupCgroupCpusetCpus(virCgroupPtr cgroup,

View File

@ -52,10 +52,6 @@ int qemuSetupCpusetMems(virDomainObjPtr vm);
int qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
unsigned long long period,
long long quota);
int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup,
virDomainPinDefPtr *vcpupin,
int nvcpupin,
int vcpuid);
int qemuSetupCgroupCpusetCpus(virCgroupPtr cgroup, virBitmapPtr cpumask);
int qemuSetupCgroupForVcpu(virDomainObjPtr vm);
int qemuSetupCgroupForIOThreads(virDomainObjPtr vm);

View File

@ -4775,9 +4775,8 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
}
if (cgroup_vcpu) {
if (qemuSetupCgroupVcpuPin(cgroup_vcpu,
vm->def->cputune.vcpupin,
vm->def->cputune.nvcpupin, i) < 0) {
if (qemuSetupCgroupCpusetCpus(cgroup_vcpu,
vcpupin->cpumask) < 0) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("failed to set cpuset.cpus in cgroup"
" for vcpu %zu"), i);
@ -5143,8 +5142,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
if (virCgroupNewVcpu(priv->cgroup, vcpu, false, &cgroup_vcpu) < 0)
goto endjob;
if (qemuSetupCgroupVcpuPin(cgroup_vcpu, newVcpuPin, newVcpuPinNum,
vcpu) < 0) {
if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, pcpumap) < 0) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("failed to set cpuset.cpus in cgroup"
" for vcpu %d"), vcpu);