|
 |
c480ed |
From 541ede1193bfb32f73d76918d755c0f3d403e5ce Mon Sep 17 00:00:00 2001
|
|
|
c480ed |
Message-Id: <541ede1193bfb32f73d76918d755c0f3d403e5ce@dist-git>
|
|
|
c480ed |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c480ed |
Date: Mon, 1 Jul 2019 17:07:57 +0200
|
|
|
c480ed |
Subject: [PATCH] vircgrouptest: prepare testCgroupDetectMounts for cgroup v2
|
|
|
c480ed |
MIME-Version: 1.0
|
|
|
c480ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
c480ed |
Content-Transfer-Encoding: 8bit
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c480ed |
(cherry picked from commit 9f8d170dab8dc30d4563cb038e5aef393b0d1128)
|
|
|
c480ed |
|
|
|
c480ed |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c480ed |
Message-Id: <f9905a25dc85ad266308c81afeeab379ca20a8ba.1561993100.git.phrdina@redhat.com>
|
|
|
c480ed |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
---
|
|
|
c480ed |
tests/vircgroupdata/all-in-one.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/cgroups1.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/cgroups2.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/cgroups3.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/fedora-18.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/fedora-21.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/kubevirt.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/ovirt-node-6.6.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/ovirt-node-7.1.parsed | 1 +
|
|
|
c480ed |
tests/vircgroupdata/rhel-7.1.parsed | 1 +
|
|
|
c480ed |
tests/vircgrouptest.c | 2 ++
|
|
|
c480ed |
11 files changed, 12 insertions(+)
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/all-in-one.parsed b/tests/vircgroupdata/all-in-one.parsed
|
|
|
c480ed |
index d703d08fb9..97c96e8ecd 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/all-in-one.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/all-in-one.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /not/really/sys/fs/cgroup
|
|
|
c480ed |
net_cls <null>
|
|
|
c480ed |
perf_event <null>
|
|
|
c480ed |
name=systemd <null>
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/cgroups1.parsed b/tests/vircgroupdata/cgroups1.parsed
|
|
|
c480ed |
index b6916f17a1..16431aa006 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/cgroups1.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/cgroups1.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls /sys/fs/cgroup/net_cls
|
|
|
c480ed |
perf_event <null>
|
|
|
c480ed |
name=systemd <null>
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/cgroups2.parsed b/tests/vircgroupdata/cgroups2.parsed
|
|
|
c480ed |
index 5eb2bc7bb2..d1bb0dcb7c 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/cgroups2.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/cgroups2.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls <null>
|
|
|
c480ed |
perf_event /sys/fs/cgroup/perf_event
|
|
|
c480ed |
name=systemd <null>
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/cgroups3.parsed b/tests/vircgroupdata/cgroups3.parsed
|
|
|
c480ed |
index 2b1f3825c1..44e475c9d2 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/cgroups3.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/cgroups3.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls /sys/fs/cgroup/net_cls
|
|
|
c480ed |
perf_event /sys/fs/cgroup/perf_event
|
|
|
c480ed |
name=systemd <null>
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/fedora-18.parsed b/tests/vircgroupdata/fedora-18.parsed
|
|
|
c480ed |
index 8d5ba75c7e..662a38a9e8 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/fedora-18.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/fedora-18.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls /sys/fs/cgroup/net_cls
|
|
|
c480ed |
perf_event /sys/fs/cgroup/perf_event
|
|
|
c480ed |
name=systemd /sys/fs/cgroup/systemd
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/fedora-21.parsed b/tests/vircgroupdata/fedora-21.parsed
|
|
|
c480ed |
index 3377af0382..4e447fd7bd 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/fedora-21.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/fedora-21.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls /sys/fs/cgroup/net_cls,net_prio
|
|
|
c480ed |
perf_event /sys/fs/cgroup/perf_event
|
|
|
c480ed |
name=systemd /sys/fs/cgroup/systemd
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
|
|
|
c480ed |
index 6948707238..bf977f8363 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/kubevirt.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/kubevirt.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls <null>
|
|
|
c480ed |
perf_event /sys/fs/cgroup/perf_event
|
|
|
c480ed |
name=systemd <null>
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/ovirt-node-6.6.parsed b/tests/vircgroupdata/ovirt-node-6.6.parsed
|
|
|
c480ed |
index 01bf466be6..9d10813d8c 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/ovirt-node-6.6.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/ovirt-node-6.6.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /cgroup/blkio
|
|
|
c480ed |
net_cls /cgroup/net_cls
|
|
|
c480ed |
perf_event <null>
|
|
|
c480ed |
name=systemd <null>
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/ovirt-node-7.1.parsed b/tests/vircgroupdata/ovirt-node-7.1.parsed
|
|
|
c480ed |
index 8d5ba75c7e..662a38a9e8 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/ovirt-node-7.1.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/ovirt-node-7.1.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls /sys/fs/cgroup/net_cls
|
|
|
c480ed |
perf_event /sys/fs/cgroup/perf_event
|
|
|
c480ed |
name=systemd /sys/fs/cgroup/systemd
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgroupdata/rhel-7.1.parsed b/tests/vircgroupdata/rhel-7.1.parsed
|
|
|
c480ed |
index 8d5ba75c7e..662a38a9e8 100644
|
|
|
c480ed |
--- a/tests/vircgroupdata/rhel-7.1.parsed
|
|
|
c480ed |
+++ b/tests/vircgroupdata/rhel-7.1.parsed
|
|
|
c480ed |
@@ -8,3 +8,4 @@ blkio /sys/fs/cgroup/blkio
|
|
|
c480ed |
net_cls /sys/fs/cgroup/net_cls
|
|
|
c480ed |
perf_event /sys/fs/cgroup/perf_event
|
|
|
c480ed |
name=systemd /sys/fs/cgroup/systemd
|
|
|
c480ed |
+unified <null>
|
|
|
c480ed |
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
|
|
|
c480ed |
index 1837383e61..b66682e6c8 100644
|
|
|
c480ed |
--- a/tests/vircgrouptest.c
|
|
|
c480ed |
+++ b/tests/vircgrouptest.c
|
|
|
c480ed |
@@ -176,6 +176,8 @@ testCgroupDetectMounts(const void *args)
|
|
|
c480ed |
virCgroupControllerTypeToString(i),
|
|
|
c480ed |
NULLSTR(group->legacy[i].mountPoint));
|
|
|
c480ed |
}
|
|
|
c480ed |
+ virBufferAsprintf(&buf, "%-12s %s\n",
|
|
|
c480ed |
+ "unified", NULLSTR(group->unified.mountPoint));
|
|
|
c480ed |
if (virBufferCheckError(&buf) < 0)
|
|
|
c480ed |
goto cleanup;
|
|
|
c480ed |
|
|
|
c480ed |
--
|
|
|
c480ed |
2.22.0
|
|
|
c480ed |
|