From nobody Sun Feb 8 18:39:29 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 1537285627338595.3144283386368; Tue, 18 Sep 2018 08:47:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 472533084049; Tue, 18 Sep 2018 15:47:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00F885D9C7; Tue, 18 Sep 2018 15:47:04 +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 9540B4A478; Tue, 18 Sep 2018 15:47:04 +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 w8IFkOMM012011 for ; Tue, 18 Sep 2018 11:46:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8C394DC48; Tue, 18 Sep 2018 15:46:24 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D5FC5D9C7 for ; Tue, 18 Sep 2018 15:46:24 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 18 Sep 2018 17:45:34 +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 13/47] vircgroup: extract virCgroupV1GetAnyController 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 18 Sep 2018 15:47:06 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: Fabiano Fid=C3=AAncio Reviewed-by: J=EF=BF=BDn Tomko --- src/util/vircgroup.c | 16 ++++------------ src/util/vircgroupbackend.h | 4 ++++ src/util/vircgroupv1.c | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 3d10ac2427..817ee8f6ca 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3167,19 +3167,11 @@ virCgroupPathOfAnyController(virCgroupPtr group, const char *name, char **keypath) { - size_t i; + int controller; =20 - for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - /* Reject any controller with a placement - * of '/' to avoid doing bad stuff to the root - * cgroup - */ - if (group->controllers[i].mountPoint && - group->controllers[i].placement && - STRNEQ(group->controllers[i].placement, "/")) { - return virCgroupPathOfController(group, i, name, keypath); - } - } + controller =3D group->backend->getAnyController(group); + if (controller >=3D 0) + return virCgroupPathOfController(group, controller, name, keypath); =20 virReportSystemError(ENOSYS, "%s", _("No controllers are mounted")); diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index 8b751af355..933f59151a 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -77,6 +77,9 @@ typedef bool (*virCgroupHasControllerCB)(virCgroupPtr cgroup, int controller); =20 +typedef int +(*virCgroupGetAnyControllerCB)(virCgroupPtr group); + struct _virCgroupBackend { virCgroupBackendType type; =20 @@ -91,6 +94,7 @@ struct _virCgroupBackend { virCgroupGetPlacementCB getPlacement; virCgroupDetectControllersCB detectControllers; virCgroupHasControllerCB hasController; + virCgroupGetAnyControllerCB getAnyController; }; typedef struct _virCgroupBackend virCgroupBackend; typedef virCgroupBackend *virCgroupBackendPtr; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index c040d50141..105024ddde 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -485,6 +485,27 @@ virCgroupV1HasController(virCgroupPtr group, } =20 =20 +static int +virCgroupV1GetAnyController(virCgroupPtr group) +{ + size_t i; + + for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + /* Reject any controller with a placement + * of '/' to avoid doing bad stuff to the root + * cgroup + */ + if (group->controllers[i].mountPoint && + group->controllers[i].placement && + STRNEQ(group->controllers[i].placement, "/")) { + return i; + } + } + + return -1; +} + + virCgroupBackend virCgroupV1Backend =3D { .type =3D VIR_CGROUP_BACKEND_TYPE_V1, =20 @@ -498,6 +519,7 @@ virCgroupBackend virCgroupV1Backend =3D { .getPlacement =3D virCgroupV1GetPlacement, .detectControllers =3D virCgroupV1DetectControllers, .hasController =3D virCgroupV1HasController, + .getAnyController =3D virCgroupV1GetAnyController, }; =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list