From nobody Sun Feb 8 15:01:48 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 1537285655316460.4877174733638; Tue, 18 Sep 2018 08:47:35 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1EE098667E; Tue, 18 Sep 2018 15:47:32 +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 D9D8A7E673; Tue, 18 Sep 2018 15:47:31 +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 6A66B181D0AE; Tue, 18 Sep 2018 15:47:31 +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 w8IFlEjZ012686 for ; Tue, 18 Sep 2018 11:47:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2ADE782AD3; Tue, 18 Sep 2018 15:47:14 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id A27FF82AE1 for ; Tue, 18 Sep 2018 15:47:07 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 18 Sep 2018 17:45:56 +0200 Message-Id: <3d174ce46aa694c2b4bd5b744383c4ee6b6f683e.1537285203.git.phrdina@redhat.com> 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 35/47] vircgroup: extract virCgroupV1(Allow|Deny)AllDevices 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 18 Sep 2018 15:47:34 +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 --- src/util/vircgroup.c | 18 ++---------------- src/util/vircgroupbackend.h | 9 +++++++++ src/util/vircgroupv1.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 8a54437dfa..ca36984472 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1824,10 +1824,7 @@ virCgroupGetCpusetCpus(virCgroupPtr group, char **cp= us) int virCgroupDenyAllDevices(virCgroupPtr group) { - return virCgroupSetValueStr(group, - VIR_CGROUP_CONTROLLER_DEVICES, - "devices.deny", - "a"); + VIR_CGROUP_BACKEND_CALL(group, denyAllDevices, -1); } =20 /** @@ -1847,18 +1844,7 @@ virCgroupDenyAllDevices(virCgroupPtr group) int virCgroupAllowAllDevices(virCgroupPtr group, int perms) { - int ret =3D -1; - - if (virCgroupAllowDevice(group, 'b', -1, -1, perms) < 0) - goto cleanup; - - if (virCgroupAllowDevice(group, 'c', -1, -1, perms) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - return ret; + VIR_CGROUP_BACKEND_CALL(group, allowAllDevices, -1, perms); } =20 =20 diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index d7250cffdb..ce165fead4 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -261,6 +261,13 @@ typedef int int minor, int perms); =20 +typedef int +(*virCgroupAllowAllDevicesCB)(virCgroupPtr group, + int perms); + +typedef int +(*virCgroupDenyAllDevicesCB)(virCgroupPtr group); + struct _virCgroupBackend { virCgroupBackendType type; =20 @@ -313,6 +320,8 @@ struct _virCgroupBackend { =20 virCgroupAllowDeviceCB allowDevice; virCgroupDenyDeviceCB denyDevice; + virCgroupAllowAllDevicesCB allowAllDevices; + virCgroupDenyAllDevicesCB denyAllDevices; }; typedef struct _virCgroupBackend virCgroupBackend; typedef virCgroupBackend *virCgroupBackendPtr; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 9ac0ef555c..bd6914f878 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1731,6 +1731,35 @@ virCgroupV1DenyDevice(virCgroupPtr group, } =20 =20 +static int +virCgroupV1AllowAllDevices(virCgroupPtr group, + int perms) +{ + int ret =3D -1; + + if (virCgroupV1AllowDevice(group, 'b', -1, -1, perms) < 0) + goto cleanup; + + if (virCgroupV1AllowDevice(group, 'c', -1, -1, perms) < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + return ret; +} + + +static int +virCgroupV1DenyAllDevices(virCgroupPtr group) +{ + return virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_DEVICES, + "devices.deny", + "a"); +} + + virCgroupBackend virCgroupV1Backend =3D { .type =3D VIR_CGROUP_BACKEND_TYPE_V1, =20 @@ -1781,6 +1810,8 @@ virCgroupBackend virCgroupV1Backend =3D { =20 .allowDevice =3D virCgroupV1AllowDevice, .denyDevice =3D virCgroupV1DenyDevice, + .allowAllDevices =3D virCgroupV1AllowAllDevices, + .denyAllDevices =3D virCgroupV1DenyAllDevices, }; =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list