From be97d8496afc0df4578d1e2c089f0ad7c8fe1e9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Fri, 24 Nov 2017 18:33:34 +0100 Subject: [PATCH] qemuDomainNamespaceTeardownHostdev: rename path to paths 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 cd213479ca..f8ad931b20 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10042,14 +10042,14 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver, char **devMountsPath = NULL; size_t ndevMountsPath = 0; int ret = -1; - char **path = NULL; + char **paths = NULL; size_t i, npaths = 0; if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; if (qemuDomainGetHostdevPath(vm->def, hostdev, true, - &npaths, &path, NULL) < 0) + &npaths, &paths, NULL) < 0) goto cleanup; cfg = virQEMUDriverGetConfig(driver); @@ -10059,7 +10059,7 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver, goto cleanup; for (i = 0; i < npaths; i++) { - if (qemuDomainDetachDeviceUnlink(driver, vm, path[i], + if (qemuDomainDetachDeviceUnlink(driver, vm, paths[i], devMountsPath, ndevMountsPath) < 0) goto cleanup; } @@ -10067,8 +10067,8 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver, ret = 0; cleanup: for (i = 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; -- 2.47.2