[libvirt PATCH 1/2] Revert "vircgroup: Remove unused variables in virCgroupV2Available"

Pavel Hrdina posted 2 patches 3 years, 3 months ago
[libvirt PATCH 1/2] Revert "vircgroup: Remove unused variables in virCgroupV2Available"
Posted by Pavel Hrdina 3 years, 3 months ago
This reverts commit e49313b54ed2a149c71f9073659222742ff3ffb0.

We are going to revert commit a0f37232b9c4296ca16955cc625f75eb848ace39
as well so we need to revert this fix of that commit first.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/util/vircgroupv2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index bf6bd11fef..0e0c61d466 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -69,6 +69,9 @@ virCgroupV2Available(void)
         return false;
 
     while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {
+        g_autofree char *contFile = NULL;
+        g_autofree char *contStr = NULL;
+
         if (STRNEQ(entry.mnt_type, "cgroup2"))
             continue;
 
-- 
2.37.3
Re: [libvirt PATCH 1/2] Revert "vircgroup: Remove unused variables in virCgroupV2Available"
Posted by Peter Krempa 3 years, 3 months ago
On Tue, Oct 25, 2022 at 11:40:42 +0200, Pavel Hrdina wrote:
> This reverts commit e49313b54ed2a149c71f9073659222742ff3ffb0.
> 
> We are going to revert commit a0f37232b9c4296ca16955cc625f75eb848ace39
> as well so we need to revert this fix of that commit first.
> 
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  src/util/vircgroupv2.c | 3 +++
>  1 file changed, 3 insertions(+)

NACK, the build breaks after this patch. You must squash this into the
following patch.