From 6ee7a399fe93348c24c4535a2ada43ea67144a22 Mon Sep 17 00:00:00 2001

Message-Id: <6ee7a399fe93348c24c4535a2ada43ea67144a22@dist-git>

From: Pavel Hrdina <phrdina@redhat.com>

Date: Mon, 1 Jul 2019 17:05:53 +0200

Subject: [PATCH] vircgroup: Unexport unused function

 virCgroupRemoveRecursively

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

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

(cherry picked from commit 32686849fcdc2faca8735869eaa8d5453283a84c)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

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

Message-Id: <0e830b8383a92e496cd492d8b91b26172dd0e667.1561993099.git.phrdina@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/libvirt_private.syms |  1 -

 src/util/vircgroup.c     | 11 +----------

 src/util/vircgroup.h     |  1 -

 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms

index 41fca88d09..47695eb507 100644

--- a/src/libvirt_private.syms

+++ b/src/libvirt_private.syms

@@ -1569,7 +1569,6 @@ virCgroupNewSelf;

 virCgroupNewThread;

 virCgroupPathOfController;

 virCgroupRemove;

-virCgroupRemoveRecursively;

 virCgroupSetBlkioDeviceReadBps;

 virCgroupSetBlkioDeviceReadIops;

 virCgroupSetBlkioDeviceWeight;

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c

index 8ef6fb5e1a..7d8bf3419a 100644

--- a/src/util/vircgroup.c

+++ b/src/util/vircgroup.c

@@ -3312,7 +3312,7 @@ virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)

 }

-int

+static int

 virCgroupRemoveRecursively(char *grppath)

 {

     DIR *grpdir;

@@ -4529,15 +4529,6 @@ virCgroupSetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED,

 }

-int

-virCgroupRemoveRecursively(char *grppath ATTRIBUTE_UNUSED)

-{

-    virReportSystemError(ENXIO, "%s",

-                         _("Control groups not supported on this platform"));

-    return -1;

-}

-

-

 int

 virCgroupRemove(virCgroupPtr group ATTRIBUTE_UNUSED)

 {

diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h

index 74c7dbcccc..138bb3c076 100644

--- a/src/util/vircgroup.h

+++ b/src/util/vircgroup.h

@@ -273,7 +273,6 @@ int virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate);

 int virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus);

 int virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus);

-int virCgroupRemoveRecursively(char *grppath);

 int virCgroupRemove(virCgroupPtr group);

 int virCgroupKillRecursive(virCgroupPtr group, int signum);

-- 

2.22.0