From nobody Sun Feb 8 15:37:49 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 1533822329719590.6085077997143; Thu, 9 Aug 2018 06:45:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8CD0A931D5; Thu, 9 Aug 2018 13:45:27 +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 550AF2D099; Thu, 9 Aug 2018 13:45:27 +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 EC82F1841C5A; Thu, 9 Aug 2018 13:45:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w79DiJ74015007 for ; Thu, 9 Aug 2018 09:44:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id E6E4C2314D; Thu, 9 Aug 2018 13:44:18 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85F1A2314E for ; Thu, 9 Aug 2018 13:44:18 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 15:44:00 +0200 Message-Id: <484ae72ac1cb7ae2af64f471e8c1dde945e7565e.1533822163.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/17] vircgroup: Extract file link resolving into separate function 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 09 Aug 2018 13:45:28 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/util/vircgroup.c | 85 +++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5144b33d43..fd58ba154f 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -356,6 +356,51 @@ virCgroupCopyMounts(virCgroupPtr group, } =20 =20 +static int +virCgroupResolveMountLink(const char *mntDir, + const char *typeStr, + virCgroupControllerPtr controller) +{ + VIR_AUTOFREE(char *) linkSrc =3D NULL; + char *dirName; + struct stat sb; + + dirName =3D strrchr(mntDir, '/'); + if (!dirName) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing '/' separator in cgroup mount '%s'"), mn= tDir); + return -1; + } + + if (!strchr(dirName + 1, ',')) + return 0; + + *dirName =3D '\0'; + if (virAsprintf(&linkSrc, "%s/%s", mntDir, typeStr) < 0) + return -1; + *dirName =3D '/'; + + if (lstat(linkSrc, &sb) < 0) { + if (errno =3D=3D ENOENT) { + VIR_WARN("Controller %s co-mounted at %s is missing symlink at= %s", + typeStr, mntDir, linkSrc); + } else { + virReportSystemError(errno, _("Cannot stat %s"), linkSrc); + return -1; + } + } else { + if (!S_ISLNK(sb.st_mode)) { + VIR_WARN("Expecting a symlink at %s for controller %s", + linkSrc, typeStr); + } else { + VIR_STEAL_PTR(controller->linkPoint, linkSrc); + } + } + + return 0; +} + + /* * Process /proc/mounts figuring out what controllers are * mounted and where @@ -397,8 +442,6 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, } =20 if (typelen =3D=3D len && STREQLEN(typestr, tmp, len)) { - struct stat sb; - char *tmp2; =20 /* Note that the lines in /proc/mounts have the same * order than the mount operations, and that there may @@ -412,44 +455,12 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) = < 0) goto cleanup; =20 - tmp2 =3D strrchr(entry.mnt_dir, '/'); - if (!tmp2) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '/' separator in cgroup = mount '%s'"), - entry.mnt_dir); - goto cleanup; - } - /* If it is a co-mount it has a filename like "cpu,cpu= acct" * and we must identify the symlink path */ - if (checkLinks && strchr(tmp2 + 1, ',')) { - VIR_AUTOFREE(char *) linksrc =3D NULL; - - *tmp2 =3D '\0'; - if (virAsprintf(&linksrc, "%s/%s", - entry.mnt_dir, typestr) < 0) + if (checkLinks && + virCgroupResolveMountLink(entry.mnt_dir, typestr, + controller) < 0) { goto cleanup; - *tmp2 =3D '/'; - - if (lstat(linksrc, &sb) < 0) { - if (errno =3D=3D ENOENT) { - VIR_WARN("Controller %s co-mounted at %s i= s missing symlink at %s", - typestr, entry.mnt_dir, linksrc); - } else { - virReportSystemError(errno, - _("Cannot stat %s"), - linksrc); - goto cleanup; - } - } else { - if (!S_ISLNK(sb.st_mode)) { - VIR_WARN("Expecting a symlink at %s for co= ntroller %s", - linksrc, typestr); - } else { - controller->linkPoint =3D linksrc; - linksrc =3D NULL; - } - } } } tmp =3D next; --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list