From nobody Thu May 15 05:56:37 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1511546108158746.9808422740458; Fri, 24 Nov 2017 09:55:08 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC67C82102; Fri, 24 Nov 2017 17:55:06 +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 C24B06198C; Fri, 24 Nov 2017 17:55:06 +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 774C4180474A; Fri, 24 Nov 2017 17:55:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAOHt5P4025075 for ; Fri, 24 Nov 2017 12:55:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 91C9817B12; Fri, 24 Nov 2017 17:55:05 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1794E5FFF2 for ; Fri, 24 Nov 2017 17:55:01 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 24 Nov 2017 18:54:52 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/6] qemuDomainNamespaceTeardownHostdev: rename path to paths 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 24 Nov 2017 17:55:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" To match the "things/nthings" pattern used in virDomainDef. --- src/qemu/qemu_domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9dab6b24b..c4a1e6d0b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9766,14 +9766,14 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr= driver, char **devMountsPath =3D NULL; size_t ndevMountsPath =3D 0; int ret =3D -1; - char **path =3D NULL; + char **paths =3D NULL; size_t i, npaths =3D 0; =20 if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; =20 if (qemuDomainGetHostdevPath(vm->def, hostdev, true, - &npaths, &path, NULL) < 0) + &npaths, &paths, NULL) < 0) goto cleanup; =20 cfg =3D virQEMUDriverGetConfig(driver); @@ -9783,7 +9783,7 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr d= river, goto cleanup; =20 for (i =3D 0; i < npaths; i++) { - if (qemuDomainDetachDeviceUnlink(driver, vm, path[i], + if (qemuDomainDetachDeviceUnlink(driver, vm, paths[i], devMountsPath, ndevMountsPath) < = 0) goto cleanup; } @@ -9791,8 +9791,8 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr d= river, ret =3D 0; cleanup: for (i =3D 0; i < npaths; i++) - VIR_FREE(path[i]); - VIR_FREE(path); + VIR_FREE(paths[i]); + VIR_FREE(paths); virStringListFreeCount(devMountsPath, ndevMountsPath); virObjectUnref(cfg); return ret; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list