From nobody Sun Feb 8 17:03:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1632146469; cv=none; d=zohomail.com; s=zohoarc; b=PwBS9XleJPF5+ZCLVaPSgLa4MZZ0Wmo8RvnXPUeC9clRhL29fvibc2d/uQ8Rs3v1/egDP7DjVUx3EA6vce7chBlOgXHrozCRq/yiS+mYX8Yd3Mogn2esv/tKeUTUh/T6Y3juXvOcWyJqjlVo/XWJUyE4N8VCIxwm0CBTSjOlAC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632146469; 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=/tJZtVWpMjjpZvz0ZdK/TzlWQ/Ayng+m/wBRoOOiCLs=; b=O1GyVMTp0E5oOCqjjN5rKqChjM976JenqCBH0skw7WFK0a0vx7QtmaAvmC35N4ULHZO4irKXyzqJ76gPZMG+Hq8qjNg+0GctlsRvxs0jikbzBE5PCC3BWQmmwnuB1LYdbYofqn4mvMRrAlSvwPSsBcNbdiceDS1EIj31mDA2w7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 16321464696181023.6815135986219; Mon, 20 Sep 2021 07:01:09 -0700 (PDT) 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-529-gMysD8xrNYWxoUx5e8S7Nw-1; Mon, 20 Sep 2021 10:01:01 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 802D310168C7; Mon, 20 Sep 2021 14:00:54 +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 62D8760938; Mon, 20 Sep 2021 14:00:53 +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 2D3751805986; Mon, 20 Sep 2021 14:00:53 +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 18KE0oLW010617 for ; Mon, 20 Sep 2021 10:00:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AD3B60938; Mon, 20 Sep 2021 14:00:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65F066060F for ; Mon, 20 Sep 2021 14:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632146468; 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=/tJZtVWpMjjpZvz0ZdK/TzlWQ/Ayng+m/wBRoOOiCLs=; b=NFN118bNSVas4w2TndTDG/jS4Iw+UDdVrNL0f6Ht5QJug0SOf/38+lwqa4v+7oMXfiOCZO zTeL6FxrvmAOnfAWifaLf+NbM/8ZmF4q6llg5Y4sXDpHCbCIrxKfMjkxnF8VljjLqpD8EH QWUqu9JpHHoFifeHR3zG+1U+MC2LcBM= X-MC-Unique: gMysD8xrNYWxoUx5e8S7Nw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/4] virDevMapperGetTargets: Use a linked list as return type Date: Mon, 20 Sep 2021 16:00:44 +0200 Message-Id: <8ce6e38ec2946294daedc5d1aba7d689283aa45a.1632146397.git.pkrempa@redhat.com> 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.13 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) X-ZM-MESSAGEID: 1632146490126100005 Content-Type: text/plain; charset="utf-8" Of the two callers one simply iterates over the returned paths and the second one appends the returned paths to another linked list. Simplify all of this by directly returning a linked list. Signed-off-by: Peter Krempa --- src/qemu/qemu_cgroup.c | 11 ++++++----- src/qemu/qemu_namespace.c | 9 +++------ src/util/virdevmapper.c | 38 +++++++++++++++++--------------------- src/util/virdevmapper.h | 2 +- tests/qemuhotplugmock.c | 10 ++++------ 5 files changed, 31 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 6d4a82b3cd..471cbc3b8f 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -38,6 +38,7 @@ #include "virnuma.h" #include "virdevmapper.h" #include "virutil.h" +#include "virglibutil.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -60,8 +61,8 @@ qemuSetupImagePathCgroup(virDomainObj *vm, { qemuDomainObjPrivate *priv =3D vm->privateData; int perms =3D VIR_CGROUP_DEVICE_READ; - g_auto(GStrv) targetPaths =3D NULL; - size_t i; + g_autoptr(virGSListString) targetPaths =3D NULL; + GSList *n; int rv; if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) @@ -94,10 +95,10 @@ qemuSetupImagePathCgroup(virDomainObj *vm, return -1; } - for (i =3D 0; targetPaths && targetPaths[i]; i++) { - rv =3D virCgroupAllowDevicePath(priv->cgroup, targetPaths[i], perm= s, false); + for (n =3D targetPaths; n; n =3D n->next) { + rv =3D virCgroupAllowDevicePath(priv->cgroup, n->data, perms, fals= e); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", targetPaths[i], + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", n->data, virCgroupGetDevicePermsString(perms), rv); if (rv < 0) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 728d77fc61..f1aaca86b1 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -251,8 +251,7 @@ qemuDomainSetupDisk(virStorageSource *src, if (!(tmpPath =3D virPCIDeviceAddressGetIOMMUGroupDev(&next->n= vme->pciAddr))) return -1; } else { - g_auto(GStrv) targetPaths =3D NULL; - GStrv tmp; + GSList *targetPaths; if (virStorageSourceIsEmpty(next) || !virStorageSourceIsLocalStorage(next)) { @@ -270,10 +269,8 @@ qemuDomainSetupDisk(virStorageSource *src, return -1; } - if (targetPaths) { - for (tmp =3D targetPaths; *tmp; tmp++) - *paths =3D g_slist_prepend(*paths, g_steal_pointer(tmp= )); - } + if (targetPaths) + *paths =3D g_slist_concat(g_slist_reverse(targetPaths), *p= aths); } *paths =3D g_slist_prepend(*paths, g_steal_pointer(&tmpPath)); diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 301c8f3ba7..e42324fd19 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -36,6 +36,7 @@ # include "virstring.h" # include "virfile.h" # include "virlog.h" +# include "virglibutil.h" # define VIR_FROM_THIS VIR_FROM_STORAGE @@ -217,18 +218,16 @@ virDMSanitizepath(const char *path) static int virDevMapperGetTargetsImpl(int controlFD, const char *path, - char ***devPaths_ret, + GSList **devPaths, unsigned int ttl) { g_autofree char *sanitizedPath =3D NULL; g_autofree char *buf =3D NULL; struct dm_ioctl dm; struct dm_target_deps *deps =3D NULL; - g_auto(GStrv) devPaths =3D NULL; size_t i; memset(&dm, 0, sizeof(dm)); - *devPaths_ret =3D NULL; if (ttl =3D=3D 0) { errno =3D ELOOP; @@ -258,24 +257,17 @@ virDevMapperGetTargetsImpl(int controlFD, return -1; } - devPaths =3D g_new0(char *, deps->count + 1); for (i =3D 0; i < deps->count; i++) { - devPaths[i] =3D g_strdup_printf("/dev/block/%u:%u", - major(deps->dev[i]), - minor(deps->dev[i])); - } - - for (i =3D 0; i < deps->count; i++) { - g_auto(GStrv) tmpPaths =3D NULL; + char *curpath =3D g_strdup_printf("/dev/block/%u:%u", + major(deps->dev[i]), + minor(deps->dev[i])); - if (virDevMapperGetTargetsImpl(controlFD, devPaths[i], &tmpPaths, = ttl - 1) < 0) - return -1; + *devPaths =3D g_slist_prepend(*devPaths, curpath); - if (virStringListMerge(&devPaths, &tmpPaths) < 0) + if (virDevMapperGetTargetsImpl(controlFD, curpath, devPaths, ttl -= 1) < 0) return -1; } - *devPaths_ret =3D g_steal_pointer(&devPaths); return 0; } @@ -283,11 +275,10 @@ virDevMapperGetTargetsImpl(int controlFD, /** * virDevMapperGetTargets: * @path: devmapper target - * @devPaths: returned string list of devices + * @devPaths: filled in by a GSList containing the paths * * For given @path figure out its targets, and store them in - * @devPaths array. Note, @devPaths is a string list so it's NULL - * terminated. + * @devPaths. * * If @path is not a devmapper device, @devPaths is set to NULL and * success is returned. @@ -301,10 +292,11 @@ virDevMapperGetTargetsImpl(int controlFD, */ int virDevMapperGetTargets(const char *path, - char ***devPaths) + GSList **devPaths) { VIR_AUTOCLOSE controlFD =3D -1; const unsigned int ttl =3D 32; + g_autoptr(virGSListString) paths =3D NULL; /* Arbitrary limit on recursion level. A devmapper target can * consist of devices or yet another targets. If that's the @@ -321,7 +313,11 @@ virDevMapperGetTargets(const char *path, return -1; } - return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl); + if (virDevMapperGetTargetsImpl(controlFD, path, &paths, ttl) < 0) + return -1; + + *devPaths =3D g_slist_reverse(g_steal_pointer(&paths)); + return 0; } @@ -346,7 +342,7 @@ virIsDevMapperDevice(const char *dev_name) int virDevMapperGetTargets(const char *path G_GNUC_UNUSED, - char ***devPaths G_GNUC_UNUSED) + GSlist **devPaths G_GNUC_UNUSED) { errno =3D ENOSYS; return -1; diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h index 834900692e..4d8d3ccdb8 100644 --- a/src/util/virdevmapper.h +++ b/src/util/virdevmapper.h @@ -24,7 +24,7 @@ int virDevMapperGetTargets(const char *path, - char ***devPaths) G_GNUC_NO_INLINE; + GSList **devPaths) G_GNUC_NO_INLINE; bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1); diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index d1fc50c5f0..3b5f858044 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -54,16 +54,14 @@ qemuDomainGetUnplugTimeout(virDomainObj *vm) int virDevMapperGetTargets(const char *path, - char ***devPaths) + GSList **devPaths) { *devPaths =3D NULL; if (STREQ(path, "/dev/mapper/virt")) { - *devPaths =3D g_new0(char *, 4); - (*devPaths)[0] =3D g_strdup("/dev/block/8:0"); /* /dev/sda */ - (*devPaths)[1] =3D g_strdup("/dev/block/8:16"); /* /dev/sdb */ - (*devPaths)[2] =3D g_strdup("/dev/block/8:32"); /* /dev/sdc */ - (*devPaths)[3] =3D NULL; + *devPaths =3D g_slist_prepend(*devPaths, g_strdup("/dev/block/8:32= ")); /* /dev/sdc */ + *devPaths =3D g_slist_prepend(*devPaths, g_strdup("/dev/block/8:16= ")); /* /dev/sdb */ + *devPaths =3D g_slist_prepend(*devPaths, g_strdup("/dev/block/8:0"= )); /* /dev/sda */ } return 0; --=20 2.31.1