render / rpms / libvirt

Forked from rpms/libvirt 7 months ago
Clone
Source Code
GIT

Blame SOURCES/libvirt-vircgrouptest-prepare-testCgroupDetectMounts-for-cgroup-v2.patch

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

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation