[libvirt] [PATCH 0/6] Remove some repetitive code from qemuDomainNamespace* functions
Ján Tomko (6): qemuDomainNamespaceTeardownHostdev: rename path to paths Introduce qemuDomainNamespaceMknodPaths Introduce qemuDomainNamespaceMknodPath Introduce qemuDomainNamespaceUnlinkPaths Introduce qemuDomainNamespaceUnlinkPath Do not pass driver to qemuDomainNamespace{Setup,Teardown} functions src/qemu/qemu_domain.c | 394 ++++++++++++++++++------------------------------ src/qemu/qemu_domain.h | 30 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 42 +++--- 4 files changed, 176 insertions(+), 292 deletions(-) -- 2.13.6
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 = 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); @@ -9783,7 +9783,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; } @@ -9791,8 +9791,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.13.6
Separate the logic of creating devices from their gathering. Use this new function in qemuDomainNamespaceSetupHostdev and qemuDomainNamespaceSetupDisk. --- src/qemu/qemu_domain.c | 82 +++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c4a1e6d0b..d931afd3d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9657,16 +9657,18 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, } -int -qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStorageSourcePtr src) +static int +qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, + const char **paths, + size_t npaths) { - virQEMUDriverConfigPtr cfg = NULL; + qemuDomainObjPrivatePtr priv = vm->privateData; + virQEMUDriverPtr driver = priv->driver; + virQEMUDriverConfigPtr cfg; char **devMountsPath = NULL; size_t ndevMountsPath = 0; - virStorageSourcePtr next; int ret = -1; + size_t i; if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) return 0; @@ -9677,6 +9679,35 @@ qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver, &ndevMountsPath) < 0) goto cleanup; + for (i = 0; i < npaths; i++) { + if (qemuDomainAttachDeviceMknod(driver, + vm, + paths[i], + devMountsPath, ndevMountsPath) < 0) + goto cleanup; + } + + ret = 0; + cleanup: + virStringListFreeCount(devMountsPath, ndevMountsPath); + virObjectUnref(cfg); + return ret; +} + + +int +qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + virStorageSourcePtr src) +{ + virStorageSourcePtr next; + char **paths = NULL; + size_t npaths; + int ret = -1; + + if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) + return 0; + for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) { if (virStorageSourceIsEmpty(next) || !virStorageSourceIsLocalStorage(next)) { @@ -9684,17 +9715,16 @@ qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver, continue; } - if (qemuDomainAttachDeviceMknod(driver, - vm, - next->path, - devMountsPath, ndevMountsPath) < 0) + if (VIR_APPEND_ELEMENT_COPY(paths, npaths, next->path) < 0) goto cleanup; } + if (qemuDomainNamespaceMknodPaths(vm, (const char **)paths, npaths) < 0) + return -1; + ret = 0; cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); + VIR_FREE(paths); return ret; } @@ -9715,44 +9745,28 @@ qemuDomainNamespaceTeardownDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceSetupHostdev(virQEMUDriverPtr driver, +qemuDomainNamespaceSetupHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) { - virQEMUDriverConfigPtr cfg = NULL; - 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(NULL, hostdev, false, &npaths, &path, NULL) < 0) + if (qemuDomainGetHostdevPath(NULL, hostdev, false, &npaths, &paths, NULL) < 0) goto cleanup; - cfg = virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) - goto cleanup; - - for (i = 0; i < npaths; i++) { - if (qemuDomainAttachDeviceMknod(driver, - vm, - path[i], - devMountsPath, ndevMountsPath) < 0) + if (qemuDomainNamespaceMknodPaths(vm, (const char **)paths, npaths) < 0) goto cleanup; - } ret = 0; cleanup: for (i = 0; i < npaths; i++) - VIR_FREE(path[i]); - VIR_FREE(path); - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); + VIR_FREE(paths[i]); + VIR_FREE(paths); return ret; } -- 2.13.6
Use this function in qemuDomainNamespaceSetup* functions which only require creating one device. --- src/qemu/qemu_domain.c | 120 +++++++++++-------------------------------------- 1 file changed, 26 insertions(+), 94 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d931afd3d..015d08a29 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9695,6 +9695,16 @@ qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, } +static int +qemuDomainNamespaceMknodPath(virDomainObjPtr vm, + const char *path) +{ + const char *paths[] = { path }; + + return qemuDomainNamespaceMknodPaths(vm, paths, 1); +} + + int qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -9814,35 +9824,17 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver, int -qemuDomainNamespaceSetupMemory(virQEMUDriverPtr driver, +qemuDomainNamespaceSetupMemory(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 (qemuDomainNamespaceMknodPath(vm, mem->nvdimmPath) < 0) + return -1; - if (qemuDomainAttachDeviceMknod(driver, vm, mem->nvdimmPath, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } @@ -9880,18 +9872,11 @@ qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver, int -qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver, +qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainChrDefPtr chr) { - virQEMUDriverConfigPtr cfg = NULL; - char **devMountsPath = NULL; - size_t ndevMountsPath = 0; const char *path; - int ret = -1; - - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; if (!(path = virDomainChrSourceDefGetPath(chr->source))) return 0; @@ -9901,22 +9886,10 @@ qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver, chr->source->data.nix.listen) return 0; - cfg = virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) - goto cleanup; + if (qemuDomainNamespaceMknodPath(vm, path) < 0) + return -1; - if (qemuDomainAttachDeviceMknod(driver, - vm, - path, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } @@ -9958,18 +9931,11 @@ qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver, int -qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver, +qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainRNGDefPtr rng) { - virQEMUDriverConfigPtr cfg = NULL; - char **devMountsPath = NULL; - size_t ndevMountsPath = 0; const char *path = NULL; - int ret = -1; - - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: @@ -9978,26 +9944,13 @@ qemuDomainNamespaceSetupRNG(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 (path && qemuDomainNamespaceMknodPath(vm, path) < 0) + return -1; - if (qemuDomainAttachDeviceMknod(driver, - vm, - path, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + return 0; } @@ -10048,35 +10001,14 @@ int qemuDomainNamespaceSetupInput(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 (qemuDomainAttachDeviceMknod(driver, vm, path, - devMountsPath, ndevMountsPath) < 0) - goto cleanup; - - ret = 0; - cleanup: - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); - return ret; + if (path && qemuDomainNamespaceMknodPath(vm, path) < 0) + return -1; + return 0; } -- 2.13.6
Split out the logic of unlinking devices from qemuDomainNamespaceTeardownHostdev for reuse in other functions. --- src/qemu/qemu_domain.c | 55 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 015d08a29..e65e57b97 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9705,6 +9705,43 @@ qemuDomainNamespaceMknodPath(virDomainObjPtr vm, } +static int +qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, + const char **paths, + size_t npaths) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virQEMUDriverPtr driver = priv->driver; + virQEMUDriverConfigPtr cfg; + char **devMountsPath = NULL; + size_t ndevMountsPath = 0; + size_t i; + int ret = -1; + + if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) + return 0; + + cfg = virQEMUDriverGetConfig(driver); + + if (qemuDomainGetPreservedMounts(cfg, vm, + &devMountsPath, NULL, + &ndevMountsPath) < 0) + goto cleanup; + + for (i = 0; i < npaths; i++) { + if (qemuDomainDetachDeviceUnlink(driver, vm, paths[i], + devMountsPath, ndevMountsPath) < 0) + goto cleanup; + } + + + cleanup: + virStringListFreeCount(devMountsPath, ndevMountsPath); + virObjectUnref(cfg); + return ret; +} + + int qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -9782,13 +9819,10 @@ qemuDomainNamespaceSetupHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver, +qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) { - virQEMUDriverConfigPtr cfg = NULL; - char **devMountsPath = NULL; - size_t ndevMountsPath = 0; int ret = -1; char **paths = NULL; size_t i, npaths = 0; @@ -9800,25 +9834,14 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver, &npaths, &paths, NULL) < 0) goto cleanup; - cfg = virQEMUDriverGetConfig(driver); - if (qemuDomainGetPreservedMounts(cfg, vm, - &devMountsPath, NULL, - &ndevMountsPath) < 0) + if (npaths != 0 && qemuDomainNamespaceUnlinkPaths(vm, (const char **)paths, npaths) < 0) goto cleanup; - for (i = 0; i < npaths; i++) { - if (qemuDomainDetachDeviceUnlink(driver, vm, paths[i], - devMountsPath, ndevMountsPath) < 0) - goto cleanup; - } - ret = 0; cleanup: for (i = 0; i < npaths; i++) VIR_FREE(paths[i]); VIR_FREE(paths); - virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); return ret; } -- 2.13.6
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 e65e57b97..dcf6df387 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9742,6 +9742,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, @@ -9862,35 +9872,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; } @@ -9917,39 +9909,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; } @@ -9978,19 +9952,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; @@ -9998,25 +9965,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; } @@ -10039,35 +9994,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
The underlying function which needs the driver gets it from the passed virDomainObj object anyway. --- src/qemu/qemu_domain.c | 34 ++++++++++++---------------------- src/qemu/qemu_domain.h | 30 ++++++++++-------------------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 42 +++++++++++++++++++++--------------------- 4 files changed, 44 insertions(+), 64 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dcf6df387..722d61a80 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6186,7 +6186,7 @@ qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver, if (qemuSecurityRestoreImageLabel(driver, vm, elem) < 0) VIR_WARN("Unable to restore security label on %s", NULLSTR(elem->path)); - if (qemuDomainNamespaceTeardownDisk(driver, vm, elem) < 0) + if (qemuDomainNamespaceTeardownDisk(vm, elem) < 0) VIR_WARN("Unable to remove /dev entry for %s", NULLSTR(elem->path)); if (virDomainLockImageDetach(driver->lockManager, vm, elem) < 0) @@ -6228,7 +6228,7 @@ qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, goto cleanup; if (newSource && - qemuDomainNamespaceSetupDisk(driver, vm, elem) < 0) + qemuDomainNamespaceSetupDisk(vm, elem) < 0) goto cleanup; if (qemuSetupImageCgroup(vm, elem) < 0) @@ -9753,8 +9753,7 @@ qemuDomainNamespaceUnlinkPath(virDomainObjPtr vm, int -qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, virStorageSourcePtr src) { virStorageSourcePtr next; @@ -9787,8 +9786,7 @@ qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, +qemuDomainNamespaceTeardownDisk(virDomainObjPtr vm ATTRIBUTE_UNUSED, virStorageSourcePtr src ATTRIBUTE_UNUSED) { /* While in hotplug case we create the whole backing chain, @@ -9802,8 +9800,7 @@ qemuDomainNamespaceTeardownDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceSetupHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) { int ret = -1; @@ -9829,8 +9826,7 @@ qemuDomainNamespaceSetupHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) { int ret = -1; @@ -9857,8 +9853,7 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceSetupMemory(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceSetupMemory(virDomainObjPtr vm, virDomainMemoryDefPtr mem) { if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM) @@ -9872,8 +9867,7 @@ qemuDomainNamespaceSetupMemory(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceTeardownMemory(virDomainObjPtr vm, virDomainMemoryDefPtr mem) { if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM) @@ -9887,8 +9881,7 @@ qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceSetupChardev(virDomainObjPtr vm, virDomainChrDefPtr chr) { const char *path; @@ -9909,8 +9902,7 @@ qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceTeardownChardev(virDomainObjPtr vm, virDomainChrDefPtr chr) { const char *path = NULL; @@ -9928,8 +9920,7 @@ qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceSetupRNG(virDomainObjPtr vm, virDomainRNGDefPtr rng) { const char *path = NULL; @@ -9952,8 +9943,7 @@ qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, +qemuDomainNamespaceTeardownRNG(virDomainObjPtr vm, virDomainRNGDefPtr rng) { const char *path = NULL; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c33af3671..e1f8a809a 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -905,44 +905,34 @@ void qemuDomainDestroyNamespace(virQEMUDriverPtr driver, bool qemuDomainNamespaceAvailable(qemuDomainNamespace ns); -int qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, virStorageSourcePtr src); -int qemuDomainNamespaceTeardownDisk(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceTeardownDisk(virDomainObjPtr vm, virStorageSourcePtr src); -int qemuDomainNamespaceSetupHostdev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev); -int qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev); -int qemuDomainNamespaceSetupMemory(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceSetupMemory(virDomainObjPtr vm, virDomainMemoryDefPtr memory); -int qemuDomainNamespaceTeardownMemory(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceTeardownMemory(virDomainObjPtr vm, virDomainMemoryDefPtr memory); -int qemuDomainNamespaceSetupChardev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceSetupChardev(virDomainObjPtr vm, virDomainChrDefPtr chr); -int qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceTeardownChardev(virDomainObjPtr vm, virDomainChrDefPtr chr); -int qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceSetupRNG(virDomainObjPtr vm, virDomainRNGDefPtr rng); -int qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainNamespaceTeardownRNG(virDomainObjPtr vm, virDomainRNGDefPtr rng); int qemuDomainNamespaceSetupInput(virDomainObjPtr vm, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0ec5efbc2..0fb7c3347 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16528,7 +16528,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, if (disk->mirror->format && disk->mirror->format != VIR_STORAGE_FILE_RAW && - (qemuDomainNamespaceSetupDisk(driver, vm, disk->src) < 0 || + (qemuDomainNamespaceSetupDisk(vm, disk->src) < 0 || qemuSetupDiskCgroup(vm, disk) < 0 || qemuSecuritySetDiskLabel(driver, vm, disk) < 0)) goto cleanup; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index cbc7af59b..f26839c09 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -112,7 +112,7 @@ qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver, vm, disk) < 0) goto cleanup; - if (qemuDomainNamespaceSetupDisk(driver, vm, disk->src) < 0) + if (qemuDomainNamespaceSetupDisk(vm, disk->src) < 0) goto rollback_lock; if (qemuSecuritySetDiskLabel(driver, vm, disk) < 0) @@ -134,7 +134,7 @@ qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver, virDomainDiskGetSource(disk)); rollback_namespace: - if (qemuDomainNamespaceTeardownDisk(driver, vm, disk->src) < 0) + if (qemuDomainNamespaceTeardownDisk(vm, disk->src) < 0) VIR_WARN("Unable to remove /dev entry for %s", virDomainDiskGetSource(disk)); @@ -1304,7 +1304,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, } vm->def->hostdevs[--(vm->def->nhostdevs)] = NULL; - if (qemuDomainNamespaceSetupHostdev(driver, vm, hostdev) < 0) + if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0) goto error; teardowndevice = true; @@ -1374,7 +1374,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, qemuSecurityRestoreHostdevLabel(driver, vm, hostdev) < 0) VIR_WARN("Unable to restore host device labelling on hotplug fail"); if (teardowndevice && - qemuDomainNamespaceTeardownHostdev(driver, vm, hostdev) < 0) + qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); if (releaseaddr) @@ -1831,7 +1831,7 @@ int qemuDomainAttachChrDevice(virConnectPtr conn, if (rc == 1) need_release = true; - if (qemuDomainNamespaceSetupChardev(driver, vm, chr) < 0) + if (qemuDomainNamespaceSetupChardev(vm, chr) < 0) goto cleanup; teardowndevice = true; @@ -1877,7 +1877,7 @@ int qemuDomainAttachChrDevice(virConnectPtr conn, qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); if (teardowncgroup && qemuTeardownChardevCgroup(vm, chr) < 0) VIR_WARN("Unable to remove chr device cgroup ACL on hotplug fail"); - if (teardowndevice && qemuDomainNamespaceTeardownChardev(driver, vm, chr) < 0) + if (teardowndevice && qemuDomainNamespaceTeardownChardev(vm, chr) < 0) VIR_WARN("Unable to remove chr device from /dev"); } VIR_FREE(tlsAlias); @@ -1934,7 +1934,7 @@ qemuDomainAttachRNGDevice(virConnectPtr conn, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "rng") < 0) return -1; - if (qemuDomainNamespaceSetupRNG(driver, vm, rng) < 0) + if (qemuDomainNamespaceSetupRNG(vm, rng) < 0) goto cleanup; teardowndevice = true; @@ -1998,7 +1998,7 @@ qemuDomainAttachRNGDevice(virConnectPtr conn, qemuDomainReleaseDeviceAddress(vm, &rng->info, NULL); if (teardowncgroup && qemuTeardownRNGCgroup(vm, rng) < 0) VIR_WARN("Unable to remove RNG device cgroup ACL on hotplug fail"); - if (teardowndevice && qemuDomainNamespaceTeardownRNG(driver, vm, rng) < 0) + if (teardowndevice && qemuDomainNamespaceTeardownRNG(vm, rng) < 0) VIR_WARN("Unable to remove chr device from /dev"); } @@ -2084,7 +2084,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0) goto cleanup; - if (qemuDomainNamespaceSetupMemory(driver, vm, mem) < 0) + if (qemuDomainNamespaceSetupMemory(vm, mem) < 0) goto cleanup; teardowndevice = true; @@ -2142,7 +2142,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (teardownlabel && qemuSecurityRestoreMemoryLabel(driver, vm, mem) < 0) VIR_WARN("Unable to restore security label on memdev"); if (teardowndevice && - qemuDomainNamespaceTeardownMemory(driver, vm, mem) < 0) + qemuDomainNamespaceTeardownMemory(vm, mem) < 0) VIR_WARN("Unable to remove memory device from /dev"); } @@ -2203,7 +2203,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver, added = true; - if (qemuDomainNamespaceSetupHostdev(driver, vm, hostdev) < 0) + if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0) goto cleanup; teardowndevice = true; @@ -2244,7 +2244,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver, qemuSecurityRestoreHostdevLabel(driver, vm, hostdev) < 0) VIR_WARN("Unable to restore host device labelling on hotplug fail"); if (teardowndevice && - qemuDomainNamespaceTeardownHostdev(driver, vm, hostdev) < 0) + qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); if (added) qemuHostdevReAttachUSBDevices(driver, vm->def->name, &hostdev, 1); @@ -2302,7 +2302,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, if (qemuHostdevPrepareSCSIDevices(driver, vm->def->name, &hostdev, 1) < 0) return -1; - if (qemuDomainNamespaceSetupHostdev(driver, vm, hostdev) < 0) + if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0) goto cleanup; teardowndevice = true; @@ -2375,7 +2375,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, qemuSecurityRestoreHostdevLabel(driver, vm, hostdev) < 0) VIR_WARN("Unable to restore host device labelling on hotplug fail"); if (teardowndevice && - qemuDomainNamespaceTeardownHostdev(driver, vm, hostdev) < 0) + qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); } qemuDomainSecretHostdevDestroy(hostdev); @@ -2429,7 +2429,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, if (qemuHostdevPrepareSCSIVHostDevices(driver, vm->def->name, &hostdev, 1) < 0) return -1; - if (qemuDomainNamespaceSetupHostdev(driver, vm, hostdev) < 0) + if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0) goto cleanup; teardowndevice = true; @@ -2499,7 +2499,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, qemuSecurityRestoreHostdevLabel(driver, vm, hostdev) < 0) VIR_WARN("Unable to restore host device labelling on hotplug fail"); if (teardowndevice && - qemuDomainNamespaceTeardownHostdev(driver, vm, hostdev) < 0) + qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); if (releaseaddr) qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL); @@ -3733,7 +3733,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", src); - if (qemuDomainNamespaceTeardownDisk(driver, vm, disk->src) < 0) + if (qemuDomainNamespaceTeardownDisk(vm, disk->src) < 0) VIR_WARN("Unable to remove /dev entry for %s", src); dev.type = VIR_DOMAIN_DEVICE_DISK; @@ -3816,7 +3816,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, if (qemuTeardownMemoryDevicesCgroup(vm, mem) < 0) VIR_WARN("Unable to remove memory device cgroup ACL"); - if (qemuDomainNamespaceTeardownMemory(driver, vm, mem) < 0) + if (qemuDomainNamespaceTeardownMemory(vm, mem) < 0) VIR_WARN("Unable to remove memory device from /dev"); virDomainMemoryDefFree(mem); @@ -3946,7 +3946,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, if (qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Failed to remove host device cgroup ACL"); - if (qemuDomainNamespaceTeardownHostdev(driver, vm, hostdev) < 0) + if (qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { @@ -4154,7 +4154,7 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, if (qemuTeardownChardevCgroup(vm, chr) < 0) VIR_WARN("Failed to remove chr device cgroup ACL"); - if (qemuDomainNamespaceTeardownChardev(driver, vm, chr) < 0) + if (qemuDomainNamespaceTeardownChardev(vm, chr) < 0) VIR_WARN("Unable to remove chr device from /dev"); event = virDomainEventDeviceRemovedNewFromObj(vm, chr->info.alias); @@ -4235,7 +4235,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, if (qemuTeardownRNGCgroup(vm, rng) < 0) VIR_WARN("Failed to remove RNG device cgroup ACL"); - if (qemuDomainNamespaceTeardownRNG(driver, vm, rng) < 0) + if (qemuDomainNamespaceTeardownRNG(vm, rng) < 0) VIR_WARN("Unable to remove RNG device from /dev"); event = virDomainEventDeviceRemovedNewFromObj(vm, rng->info.alias); -- 2.13.6
On 11/24/2017 06:54 PM, Ján Tomko wrote:
Ján Tomko (6): qemuDomainNamespaceTeardownHostdev: rename path to paths Introduce qemuDomainNamespaceMknodPaths Introduce qemuDomainNamespaceMknodPath Introduce qemuDomainNamespaceUnlinkPaths Introduce qemuDomainNamespaceUnlinkPath Do not pass driver to qemuDomainNamespace{Setup,Teardown} functions
src/qemu/qemu_domain.c | 394 ++++++++++++++++++------------------------------ src/qemu/qemu_domain.h | 30 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 42 +++--- 4 files changed, 176 insertions(+), 292 deletions(-)
I wanted to review this, but upstream had diverged too much - I'm getting a lot of conflicts when trying to apply these. Can you resend? Michal
participants (2)
-
Ján Tomko -
Michal Privoznik