From nobody Sun Feb 8 14:30:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604407387; cv=none; d=zohomail.com; s=zohoarc; b=dQyiqpDjZ49tE7D+df5Svn2nXpivO51BxneqmYOeZKGk+VW+S+iK38LnLW7X1xIlxoGaf9vyv6Rhy0OLOz5rAJ84Og7ZNTxPN6i4OQW9yllnuWAQJVWLmf42URTAcSrbyQzCEQjb8fstjfqE/wppJWrT/KCyZICrk/INMqBNSGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604407387; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sNrxsijX8jGh/RCR4Yg/pIdaltBnY4iTDjCLNhAa/fw=; b=E7ifFD9b1yEVrLTqnTCnUuxZtJU4u0Mf4Totv5PeY0M0T5dttHWAkSSn6TxR6TdLoYuTUDZrmn1qIEJK9JRcyDbuUPZQ97+ezLLgtDBGeN2h62xb6Oo0z4Yo+ZCzkbize8IUq6ptK6hALxdNNQZEWHqVh2XoJLia1RaFtpZGYYI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 160440738718420.653636007848604; Tue, 3 Nov 2020 04:43:07 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-w_U_CvoaPTetOQ764rRiMw-1; Tue, 03 Nov 2020 07:42:30 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6CB764163; Tue, 3 Nov 2020 12:42:24 +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 9FAE47512A; Tue, 3 Nov 2020 12:42:24 +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 6EA61922F0; Tue, 3 Nov 2020 12:42:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A3Cg8gZ016349 for ; Tue, 3 Nov 2020 07:42:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 476F47366C; Tue, 3 Nov 2020 12:42:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id B503573667 for ; Tue, 3 Nov 2020 12:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604407386; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sNrxsijX8jGh/RCR4Yg/pIdaltBnY4iTDjCLNhAa/fw=; b=EY08HpMTd8Pf/twyd0JT2RcDOK2flKbUASK0k53TaCWf//d7CKmtU4hmNexbjvGnkZaWyl Cu4xJzDotCizWuIJYxcdlABKiZz89qmkKs9PGWwDDyG0CUH0H5qOMEhNXN/vOsUFLdPsh2 QmZxSJnfJO31Cy1vdMumvReMPtNLkx0= X-MC-Unique: w_U_CvoaPTetOQ764rRiMw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 25/25] vircgroup: drop condition for absolute path from copyPlacement callbacks Date: Tue, 3 Nov 2020 13:41:37 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that every caller to copyPlacement doesn't pass absolute path there is no need to have a condition to handle that case. Signed-off-by: Pavel Hrdina --- src/util/vircgroupv1.c | 26 ++++++++++++-------------- src/util/vircgroupv2.c | 25 +++++++++++-------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index ed4b0813f2..731e9d61d4 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -190,26 +190,24 @@ virCgroupV1CopyPlacement(virCgroupPtr group, { size_t i; for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + bool delim; + if (!group->legacy[i].mountPoint) continue; =20 if (i =3D=3D VIR_CGROUP_CONTROLLER_SYSTEMD) continue; =20 - if (path[0] =3D=3D '/') { - group->legacy[i].placement =3D g_strdup(path); - } else { - bool delim =3D STREQ(parent->legacy[i].placement, "/") || STRE= Q(path, ""); - /* - * parent =3D=3D "/" + path=3D"" =3D> "/" - * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/li= bvirt.service" - * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "= /libvirt.service/foo" - */ - group->legacy[i].placement =3D g_strdup_printf("%s%s%s", - parent->legacy[i]= .placement, - delim ? "" : "/", - path); - } + delim =3D STREQ(parent->legacy[i].placement, "/") || STREQ(path, "= "); + /* + * parent =3D=3D "/" + path=3D"" =3D> "/" + * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/libvir= t.service" + * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "/lib= virt.service/foo" + */ + group->legacy[i].placement =3D g_strdup_printf("%s%s%s", + parent->legacy[i].pla= cement, + delim ? "" : "/", + path); } =20 return 0; diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 8e058ca9c6..2b32f614e4 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -149,22 +149,19 @@ virCgroupV2CopyPlacement(virCgroupPtr group, const char *path, virCgroupPtr parent) { + bool delim =3D STREQ(parent->unified.placement, "/") || STREQ(path, ""= ); + VIR_DEBUG("group=3D%p path=3D%s parent=3D%p", group, path, parent); =20 - if (path[0] =3D=3D '/') { - group->unified.placement =3D g_strdup(path); - } else { - bool delim =3D STREQ(parent->unified.placement, "/") || STREQ(path= , ""); - /* - * parent =3D=3D "/" + path=3D"" =3D> "/" - * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/libvir= t.service" - * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "/lib= virt.service/foo" - */ - group->unified.placement =3D g_strdup_printf("%s%s%s", - parent->unified.placeme= nt, - delim ? "" : "/", - path); - } + /* + * parent =3D=3D "/" + path=3D"" =3D> "/" + * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/libvirt.se= rvice" + * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "/libvirt= .service/foo" + */ + group->unified.placement =3D g_strdup_printf("%s%s%s", + parent->unified.placement, + delim ? "" : "/", + path); =20 return 0; } --=20 2.26.2