[libvirt] [PATCHv2 6/7] Introduce qemuDomainNamespaceUnlinkPath

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, } +static int +qemuDomainNamespaceUnlinkPath(virDomainObjPtr vm, + const char *path) +{ + const char *paths[] = { path }; + + return qemuDomainNamespaceUnlinkPaths(vm, paths, 1); +} + + int qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -10130,35 +10140,17 @@ qemuDomainNamespaceSetupMemory(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver, +qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - virQEMUDriverConfigPtr cfg = NULL; - char **devMountsPath = NULL; - size_t ndevMountsPath = 0; - int ret = -1; - if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM) return 0; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - - cfg = virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) - goto cleanup; + if (qemuDomainNamespaceUnlinkPath(vm, mem->nvdimmPath) < 0) + return -1; - if (qemuDomainDetachDeviceUnlink(driver, vm, mem->nvdimmPath, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } @@ -10185,39 +10177,21 @@ qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver, +qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainChrDefPtr chr) { - virQEMUDriverConfigPtr cfg = NULL; - char **devMountsPath = NULL; - size_t ndevMountsPath = 0; - int ret = -1; const char *path = NULL; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - if (chr->source->type != VIR_DOMAIN_CHR_TYPE_DEV) return 0; path = chr->source->data.file.path; - cfg = 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; - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } @@ -10246,19 +10220,12 @@ qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver, +qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainRNGDefPtr rng) { - virQEMUDriverConfigPtr cfg = NULL; - char **devMountsPath = NULL; - size_t ndevMountsPath = 0; - int ret = -1; const char *path = NULL; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: path = rng->source.file; @@ -10266,25 +10233,13 @@ qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver, case VIR_DOMAIN_RNG_BACKEND_EGD: case VIR_DOMAIN_RNG_BACKEND_LAST: - ret = 0; - goto cleanup; + break; } - cfg = 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; - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } @@ -10307,35 +10262,15 @@ int qemuDomainNamespaceTeardownInput(virDomainObjPtr vm, virDomainInputDefPtr input) { - qemuDomainObjPrivatePtr priv = vm->privateData; - virQEMUDriverPtr driver = priv->driver; - virQEMUDriverConfigPtr cfg = NULL; - char **devMountsPath = NULL; - size_t ndevMountsPath = 0; const char *path = NULL; - int ret = -1; if (!(path = virDomainInputDefGetPath(input))) return 0; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - - cfg = 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; - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } -- 2.13.6