From 541ede1193bfb32f73d76918d755c0f3d403e5ce Mon Sep 17 00:00:00 2001
Message-Id: <541ede1193bfb32f73d76918d755c0f3d403e5ce@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:07:57 +0200
Subject: [PATCH] vircgrouptest: prepare testCgroupDetectMounts for cgroup v2
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 9f8d170dab8dc30d4563cb038e5aef393b0d1128)

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

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <f9905a25dc85ad266308c81afeeab379ca20a8ba.1561993100.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/vircgroupdata/all-in-one.parsed     | 1 +
 tests/vircgroupdata/cgroups1.parsed       | 1 +
 tests/vircgroupdata/cgroups2.parsed       | 1 +
 tests/vircgroupdata/cgroups3.parsed       | 1 +
 tests/vircgroupdata/fedora-18.parsed      | 1 +
 tests/vircgroupdata/fedora-21.parsed      | 1 +
 tests/vircgroupdata/kubevirt.parsed       | 1 +
 tests/vircgroupdata/ovirt-node-6.6.parsed | 1 +
 tests/vircgroupdata/ovirt-node-7.1.parsed | 1 +
 tests/vircgroupdata/rhel-7.1.parsed       | 1 +
 tests/vircgrouptest.c                     | 2 ++
 11 files changed, 12 insertions(+)

diff --git a/tests/vircgroupdata/all-in-one.parsed b/tests/vircgroupdata/all-in-one.parsed
index d703d08fb9..97c96e8ecd 100644
--- a/tests/vircgroupdata/all-in-one.parsed
+++ b/tests/vircgroupdata/all-in-one.parsed
@@ -8,3 +8,4 @@ blkio        /not/really/sys/fs/cgroup
 net_cls      <null>
 perf_event   <null>
 name=systemd <null>
+unified      <null>
diff --git a/tests/vircgroupdata/cgroups1.parsed b/tests/vircgroupdata/cgroups1.parsed
index b6916f17a1..16431aa006 100644
--- a/tests/vircgroupdata/cgroups1.parsed
+++ b/tests/vircgroupdata/cgroups1.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   <null>
 name=systemd <null>
+unified      <null>
diff --git a/tests/vircgroupdata/cgroups2.parsed b/tests/vircgroupdata/cgroups2.parsed
index 5eb2bc7bb2..d1bb0dcb7c 100644
--- a/tests/vircgroupdata/cgroups2.parsed
+++ b/tests/vircgroupdata/cgroups2.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      <null>
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd <null>
+unified      <null>
diff --git a/tests/vircgroupdata/cgroups3.parsed b/tests/vircgroupdata/cgroups3.parsed
index 2b1f3825c1..44e475c9d2 100644
--- a/tests/vircgroupdata/cgroups3.parsed
+++ b/tests/vircgroupdata/cgroups3.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd <null>
+unified      <null>
diff --git a/tests/vircgroupdata/fedora-18.parsed b/tests/vircgroupdata/fedora-18.parsed
index 8d5ba75c7e..662a38a9e8 100644
--- a/tests/vircgroupdata/fedora-18.parsed
+++ b/tests/vircgroupdata/fedora-18.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>
diff --git a/tests/vircgroupdata/fedora-21.parsed b/tests/vircgroupdata/fedora-21.parsed
index 3377af0382..4e447fd7bd 100644
--- a/tests/vircgroupdata/fedora-21.parsed
+++ b/tests/vircgroupdata/fedora-21.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls,net_prio
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>
diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
index 6948707238..bf977f8363 100644
--- a/tests/vircgroupdata/kubevirt.parsed
+++ b/tests/vircgroupdata/kubevirt.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      <null>
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd <null>
+unified      <null>
diff --git a/tests/vircgroupdata/ovirt-node-6.6.parsed b/tests/vircgroupdata/ovirt-node-6.6.parsed
index 01bf466be6..9d10813d8c 100644
--- a/tests/vircgroupdata/ovirt-node-6.6.parsed
+++ b/tests/vircgroupdata/ovirt-node-6.6.parsed
@@ -8,3 +8,4 @@ blkio        /cgroup/blkio
 net_cls      /cgroup/net_cls
 perf_event   <null>
 name=systemd <null>
+unified      <null>
diff --git a/tests/vircgroupdata/ovirt-node-7.1.parsed b/tests/vircgroupdata/ovirt-node-7.1.parsed
index 8d5ba75c7e..662a38a9e8 100644
--- a/tests/vircgroupdata/ovirt-node-7.1.parsed
+++ b/tests/vircgroupdata/ovirt-node-7.1.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>
diff --git a/tests/vircgroupdata/rhel-7.1.parsed b/tests/vircgroupdata/rhel-7.1.parsed
index 8d5ba75c7e..662a38a9e8 100644
--- a/tests/vircgroupdata/rhel-7.1.parsed
+++ b/tests/vircgroupdata/rhel-7.1.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 1837383e61..b66682e6c8 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -176,6 +176,8 @@ testCgroupDetectMounts(const void *args)
                           virCgroupControllerTypeToString(i),
                           NULLSTR(group->legacy[i].mountPoint));
     }
+    virBufferAsprintf(&buf, "%-12s %s\n",
+                      "unified", NULLSTR(group->unified.mountPoint));
     if (virBufferCheckError(&buf) < 0)
         goto cleanup;
 
-- 
2.22.0