qemu: cgroup: Kill qemuSetupCgroupVcpuPin()

The function doesn't make sense. There's a simpler way to achieve the
same.

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index bd768ef057e5b860442ea818a4a6b998691c93af..50546a1fca587e70605e0c0a9c0c9f0ff0f907ef 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -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,

diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index cdeb307d282e8dada82a977f05da94fd915b0d88..711a6de28b35895e1249c30752c56e497ca45f7f 100644 (file)
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -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);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 56e20d52b03423b9a078d279176b09bbb70449a5..3ce8d27be56f7156df1e2628eacfa67c2e5af47b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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);