From nobody Sun Feb 8 19:12:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1537285598686264.29183878045853; Tue, 18 Sep 2018 08:46:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C13A3A26E; Tue, 18 Sep 2018 15:46:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CA587B012; Tue, 18 Sep 2018 15:46:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 00DF0181A130; Tue, 18 Sep 2018 15:46:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8IFkGUw011917 for ; Tue, 18 Sep 2018 11:46:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A3094DC48; Tue, 18 Sep 2018 15:46:16 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE75E5D9C7 for ; Tue, 18 Sep 2018 15:46:15 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 18 Sep 2018 17:45:25 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/47] vircgroup: detect available backend for cgroup X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 18 Sep 2018 15:46:37 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We need to update one test-case because now new cgroup object will be created only if there is any cgroup backend available. Signed-off-by: Pavel Hrdina Reviewed-by: J=EF=BF=BDn Tomko --- src/util/vircgroup.c | 18 ++++++++++++++++++ src/util/vircgrouppriv.h | 3 +++ tests/vircgrouptest.c | 38 +++----------------------------------- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a5478a3fa4..0ffb5db93c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -713,10 +713,28 @@ virCgroupDetect(virCgroupPtr group, virCgroupPtr parent) { int rc; + size_t i; + virCgroupBackendPtr *backends =3D virCgroupBackendGetAll(); =20 VIR_DEBUG("group=3D%p controllers=3D%d path=3D%s parent=3D%p", group, controllers, path, parent); =20 + if (!backends) + return -1; + + for (i =3D 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { + if (backends[i] && backends[i]->available()) { + group->backend =3D backends[i]; + break; + } + } + + if (!group->backend) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("no cgroup backend available")); + return -1; + } + if (parent) { if (virCgroupCopyMounts(group, parent) < 0) return -1; diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h index 046c96c52c..2caa966fee 100644 --- a/src/util/vircgrouppriv.h +++ b/src/util/vircgrouppriv.h @@ -30,6 +30,7 @@ # define __VIR_CGROUP_PRIV_H__ =20 # include "vircgroup.h" +# include "vircgroupbackend.h" =20 struct _virCgroupController { int type; @@ -47,6 +48,8 @@ typedef virCgroupController *virCgroupControllerPtr; struct _virCgroup { char *path; =20 + virCgroupBackendPtr backend; + virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST]; }; =20 diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index bbbe6ffbe5..be3143ea52 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -114,16 +114,6 @@ const char *mountsAllInOne[VIR_CGROUP_CONTROLLER_LAST]= =3D { [VIR_CGROUP_CONTROLLER_BLKIO] =3D "/not/really/sys/fs/cgroup", [VIR_CGROUP_CONTROLLER_SYSTEMD] =3D NULL, }; -const char *mountsLogind[VIR_CGROUP_CONTROLLER_LAST] =3D { - [VIR_CGROUP_CONTROLLER_CPU] =3D NULL, - [VIR_CGROUP_CONTROLLER_CPUACCT] =3D NULL, - [VIR_CGROUP_CONTROLLER_CPUSET] =3D NULL, - [VIR_CGROUP_CONTROLLER_MEMORY] =3D NULL, - [VIR_CGROUP_CONTROLLER_DEVICES] =3D NULL, - [VIR_CGROUP_CONTROLLER_FREEZER] =3D NULL, - [VIR_CGROUP_CONTROLLER_BLKIO] =3D NULL, - [VIR_CGROUP_CONTROLLER_SYSTEMD] =3D "/not/really/sys/fs/cgroup/systemd= ", -}; =20 const char *links[VIR_CGROUP_CONTROLLER_LAST] =3D { [VIR_CGROUP_CONTROLLER_CPU] =3D "/not/really/sys/fs/cgroup/cpu", @@ -147,17 +137,6 @@ const char *linksAllInOne[VIR_CGROUP_CONTROLLER_LAST] = =3D { [VIR_CGROUP_CONTROLLER_SYSTEMD] =3D NULL, }; =20 -const char *linksLogind[VIR_CGROUP_CONTROLLER_LAST] =3D { - [VIR_CGROUP_CONTROLLER_CPU] =3D NULL, - [VIR_CGROUP_CONTROLLER_CPUACCT] =3D NULL, - [VIR_CGROUP_CONTROLLER_CPUSET] =3D NULL, - [VIR_CGROUP_CONTROLLER_MEMORY] =3D NULL, - [VIR_CGROUP_CONTROLLER_DEVICES] =3D NULL, - [VIR_CGROUP_CONTROLLER_FREEZER] =3D NULL, - [VIR_CGROUP_CONTROLLER_BLKIO] =3D NULL, - [VIR_CGROUP_CONTROLLER_SYSTEMD] =3D NULL, -}; - =20 static int testCgroupDetectMounts(const void *args) @@ -541,24 +520,13 @@ static int testCgroupNewForSelfLogind(const void *arg= s ATTRIBUTE_UNUSED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; - const char *placement[VIR_CGROUP_CONTROLLER_LAST] =3D { - [VIR_CGROUP_CONTROLLER_CPU] =3D NULL, - [VIR_CGROUP_CONTROLLER_CPUACCT] =3D NULL, - [VIR_CGROUP_CONTROLLER_CPUSET] =3D NULL, - [VIR_CGROUP_CONTROLLER_MEMORY] =3D NULL, - [VIR_CGROUP_CONTROLLER_DEVICES] =3D NULL, - [VIR_CGROUP_CONTROLLER_FREEZER] =3D NULL, - [VIR_CGROUP_CONTROLLER_BLKIO] =3D NULL, - [VIR_CGROUP_CONTROLLER_SYSTEMD] =3D "/", - }; =20 - if (virCgroupNewSelf(&cgroup) < 0) { - fprintf(stderr, "Cannot create cgroup for self\n"); + if (virCgroupNewSelf(&cgroup) =3D=3D 0) { + fprintf(stderr, "Expected cgroup creation to fail.\n"); goto cleanup; } =20 - ret =3D validateCgroup(cgroup, "", mountsLogind, linksLogind, placemen= t); - + ret =3D 0; cleanup: virCgroupFree(&cgroup); return ret; --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list