From f801a81208e113782c737f70171cbfe3e1e6f7dd Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com>
Date: Fri, 12 Dec 2014 15:03:12 +0100
Subject: [PATCH] qemu: Remove unnecessary qemuSetupCgroupPostInit function

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
 src/qemu/qemu_cgroup.c  | 9 +--------
 src/qemu/qemu_cgroup.h  | 4 ++--
 src/qemu/qemu_process.c | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 0e94cae921..ed5416b4a8 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -607,7 +607,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
 }
 
 
-static int
+int
 qemuSetupCpusetMems(virDomainObjPtr vm,
                     virBitmapPtr nodemask)
 {
@@ -866,13 +866,6 @@ qemuSetupCgroup(virQEMUDriverPtr driver,
     return ret;
 }
 
-int
-qemuSetupCgroupPostInit(virDomainObjPtr vm,
-                        virBitmapPtr nodemask)
-{
-    return qemuSetupCpusetMems(vm, nodemask);
-}
-
 int
 qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
                       unsigned long long period,
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index 4a4f22c778..72c28f7f55 100644
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -47,8 +47,8 @@ int qemuConnectCgroup(virQEMUDriverPtr driver,
 int qemuSetupCgroup(virQEMUDriverPtr driver,
                     virDomainObjPtr vm,
                     virBitmapPtr nodemask);
-int qemuSetupCgroupPostInit(virDomainObjPtr vm,
-                            virBitmapPtr nodemask);
+int qemuSetupCpusetMems(virDomainObjPtr vm,
+                        virBitmapPtr nodemask);
 int qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
                           unsigned long long period,
                           long long quota);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index a19e71a8f0..9781e4416f 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4710,7 +4710,7 @@ int qemuProcessStart(virConnectPtr conn,
         goto cleanup;
 
     VIR_DEBUG("Setting up post-init cgroup restrictions");
-    if (qemuSetupCgroupPostInit(vm, nodemask) < 0)
+    if (qemuSetupCpusetMems(vm, nodemask) < 0)
         goto cleanup;
 
     VIR_DEBUG("Detecting VCPU PIDs");
-- 
GitLab