From 8a81264b18db3de707c8c78ffe1d950c111de69c Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 27 Mar 2015 13:51:17 +0100
Subject: [PATCH] qemu: cgroup: Kill qemuSetupCgroupIOThreadsPin()

The function doesn't make sense. There's a simpler way to achieve the
same.
---
 src/qemu/qemu_cgroup.c | 15 ---------------
 src/qemu/qemu_cgroup.h |  4 ----
 src/qemu/qemu_driver.c |  5 +----
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index fad7003df8..bd768ef057 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -958,21 +958,6 @@ qemuSetupCgroupVcpuPin(virCgroupPtr cgroup,
     return -1;
 }
 
-int
-qemuSetupCgroupIOThreadsPin(virCgroupPtr cgroup,
-                            virDomainPinDefPtr *iothreadspin,
-                            int niothreadspin,
-                            int iothreadid)
-{
-    size_t i;
-
-    for (i = 0; i < niothreadspin; i++) {
-        if (iothreadid == iothreadspin[i]->id)
-            return qemuSetupCgroupCpusetCpus(cgroup, iothreadspin[i]->cpumask);
-    }
-
-    return -1;
-}
 
 int
 qemuSetupCgroupCpusetCpus(virCgroupPtr cgroup,
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index 0f7be7e63d..cdeb307d28 100644
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -57,10 +57,6 @@ int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup,
                            int nvcpupin,
                            int vcpuid);
 int qemuSetupCgroupCpusetCpus(virCgroupPtr cgroup, virBitmapPtr cpumask);
-int qemuSetupCgroupIOThreadsPin(virCgroupPtr cgroup,
-                                virDomainPinDefPtr *iothreadspin,
-                                int niothreadspin,
-                                int iothreadid);
 int qemuSetupCgroupForVcpu(virDomainObjPtr vm);
 int qemuSetupCgroupForIOThreads(virDomainObjPtr vm);
 int qemuSetupCgroupForEmulator(virDomainObjPtr vm);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a6f4dfe840..56e20d52b0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6023,10 +6023,7 @@ qemuDomainPinIOThread(virDomainPtr dom,
             if (virCgroupNewIOThread(priv->cgroup, iothread_id,
                                      false, &cgroup_iothread) < 0)
                 goto endjob;
-            if (qemuSetupCgroupIOThreadsPin(cgroup_iothread,
-                                            newIOThreadsPin,
-                                            newIOThreadsPinNum,
-                                            iothread_id) < 0) {
+            if (qemuSetupCgroupCpusetCpus(cgroup_iothread, pcpumap) < 0) {
                 virReportError(VIR_ERR_OPERATION_INVALID,
                                _("failed to set cpuset.cpus in cgroup"
                                  " for iothread %d"), iothread_id);