From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 13 Jun 2018 13:05:57 +0000 (+0200)
Subject: vircgroup: Remove pointless bool parameter
X-Git-Tag: v4.7.0-rc1~225
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0490a74aa11a2d993c50da266b8c2234c5a447ca;p=thirdparty%2Flibvirt.git

vircgroup: Remove pointless bool parameter

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 7d8bf3419a..9032bcbb63 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -251,7 +251,6 @@ static bool
 virCgroupValidateMachineGroup(virCgroupPtr group,
                               const char *name,
                               const char *drivername,
-                              bool stripEmulatorSuffix,
                               const char *machinename)
 {
     size_t i;
@@ -303,10 +302,9 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
         if (!tmp)
             return false;
 
-        if (stripEmulatorSuffix &&
-            (i == VIR_CGROUP_CONTROLLER_CPU ||
-             i == VIR_CGROUP_CONTROLLER_CPUACCT ||
-             i == VIR_CGROUP_CONTROLLER_CPUSET)) {
+        if (i == VIR_CGROUP_CONTROLLER_CPU ||
+            i == VIR_CGROUP_CONTROLLER_CPUACCT ||
+            i == VIR_CGROUP_CONTROLLER_CPUSET) {
             if (STREQ(tmp, "/emulator"))
                 *tmp = '\0';
             tmp = strrchr(group->controllers[i].placement, '/');
@@ -1486,8 +1484,7 @@ virCgroupNewDetectMachine(const char *name,
         return -1;
     }
 
-    if (!virCgroupValidateMachineGroup(*group, name, drivername,
-                                       true, machinename)) {
+    if (!virCgroupValidateMachineGroup(*group, name, drivername, machinename)) {
         VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'",
                   name, drivername);
         virCgroupFree(group);