From nobody Thu May 15 03:23:48 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 1512147056888562.0124835766782; Fri, 1 Dec 2017 08:50:56 -0800 (PST) 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 0B9A74901B; Fri, 1 Dec 2017 16:50:56 +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 CE1635D760; Fri, 1 Dec 2017 16:50:55 +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 8F4371800BDF; Fri, 1 Dec 2017 16:50:55 +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 vB1GopJ3019123 for ; Fri, 1 Dec 2017 11:50:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 55CDB5D977; Fri, 1 Dec 2017 16:50:51 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0C735D98D for ; Fri, 1 Dec 2017 16:50:44 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 1 Dec 2017 17:50:12 +0100 Message-Id: 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] [PATCHv2 6/7] Introduce qemuDomainNamespaceUnlinkPath 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.38]); Fri, 01 Dec 2017 16:50:56 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use it in every qemuDomainNamespaceTeardown* function that only wants to unlink one device. --- src/qemu/qemu_domain.c | 117 +++++++++++----------------------------------= ---- 1 file changed, 26 insertions(+), 91 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ddc93776b..c9d7dc5b0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10010,6 +10010,16 @@ qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, } =20 =20 +static int +qemuDomainNamespaceUnlinkPath(virDomainObjPtr vm, + const char *path) +{ + const char *paths[] =3D { path }; + + return qemuDomainNamespaceUnlinkPaths(vm, paths, 1); +} + + int qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -10130,35 +10140,17 @@ qemuDomainNamespaceSetupMemory(virQEMUDriverPtr d= river ATTRIBUTE_UNUSED, =20 =20 int -qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver, +qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - virQEMUDriverConfigPtr cfg =3D NULL; - char **devMountsPath =3D NULL; - size_t ndevMountsPath =3D 0; - int ret =3D -1; - if (mem->model !=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) return 0; =20 - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - - cfg =3D virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) - goto cleanup; + if (qemuDomainNamespaceUnlinkPath(vm, mem->nvdimmPath) < 0) + return -1; =20 - if (qemuDomainDetachDeviceUnlink(driver, vm, mem->nvdimmPath, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; - ret =3D 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -10185,39 +10177,21 @@ qemuDomainNamespaceSetupChardev(virQEMUDriverPtr = driver ATTRIBUTE_UNUSED, =20 =20 int -qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver, +qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSE= D, virDomainObjPtr vm, virDomainChrDefPtr chr) { - virQEMUDriverConfigPtr cfg =3D NULL; - char **devMountsPath =3D NULL; - size_t ndevMountsPath =3D 0; - int ret =3D -1; const char *path =3D NULL; =20 - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - if (chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_DEV) return 0; =20 path =3D chr->source->data.file.path; =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) - goto cleanup; - - if (qemuDomainDetachDeviceUnlink(driver, vm, path, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; + if (qemuDomainNamespaceUnlinkPath(vm, path) < 0) + return -1; =20 - ret =3D 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -10246,19 +10220,12 @@ qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driv= er ATTRIBUTE_UNUSED, =20 =20 int -qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver, +qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainRNGDefPtr rng) { - virQEMUDriverConfigPtr cfg =3D NULL; - char **devMountsPath =3D NULL; - size_t ndevMountsPath =3D 0; - int ret =3D -1; const char *path =3D NULL; =20 - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: path =3D rng->source.file; @@ -10266,25 +10233,13 @@ qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr d= river, =20 case VIR_DOMAIN_RNG_BACKEND_EGD: case VIR_DOMAIN_RNG_BACKEND_LAST: - ret =3D 0; - goto cleanup; + break; } =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) - goto cleanup; - - if (qemuDomainDetachDeviceUnlink(driver, vm, path, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; + if (path && qemuDomainNamespaceUnlinkPath(vm, path) < 0) + return -1; =20 - ret =3D 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -10307,35 +10262,15 @@ int qemuDomainNamespaceTeardownInput(virDomainObjPtr vm, virDomainInputDefPtr input) { - qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg =3D NULL; - char **devMountsPath =3D NULL; - size_t ndevMountsPath =3D 0; const char *path =3D NULL; - int ret =3D -1; =20 if (!(path =3D virDomainInputDefGetPath(input))) return 0; =20 - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - - cfg =3D virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) - goto cleanup; - - if (qemuDomainDetachDeviceUnlink(driver, vm, path, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; + if (path && qemuDomainNamespaceUnlinkPath(vm, path) < 0) + return -1; =20 - ret =3D 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list