[libvirt] [PATCH 4/4] qemu: Drop qemuDomainDeleteNamespace
After previous commits, this function is no longer needed.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_domain.c | 33 ---------------------------------
src/qemu/qemu_domain.h | 3 ---
src/qemu/qemu_process.c | 2 --
3 files changed, 38 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 137d68e47..01765dc28 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7486,39 +7486,6 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver
ATTRIBUTE_UNUSED,
#endif /* !defined(__linux__) */
-void
-qemuDomainDeleteNamespace(virQEMUDriverPtr driver,
- virDomainObjPtr vm)
-{
- virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
- char *devPath = NULL;
- char **devMountsSavePath = NULL;
- size_t ndevMountsSavePath = 0, i;
-
-
- if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
- return;
-
- if (qemuDomainGetPreservedMounts(driver, vm,
- NULL, &devMountsSavePath,
- &ndevMountsSavePath) < 0)
- goto cleanup;
-
- for (i = 0; i < ndevMountsSavePath; i++) {
- if (rmdir(devMountsSavePath[i]) < 0) {
- virReportSystemError(errno,
- _("Unable to remove %s"),
- devMountsSavePath[i]);
- /* Bet effort. Fall through. */
- }
- }
- cleanup:
- virObjectUnref(cfg);
- virStringListFreeCount(devMountsSavePath, ndevMountsSavePath);
- VIR_FREE(devPath);
-}
-
-
struct qemuDomainAttachDeviceMknodData {
virQEMUDriverPtr driver;
virDomainObjPtr vm;
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index cce879f76..88b586972 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -806,9 +806,6 @@ int qemuDomainBuildNamespace(virQEMUDriverPtr driver,
int qemuDomainCreateNamespace(virQEMUDriverPtr driver,
virDomainObjPtr vm);
-void qemuDomainDeleteNamespace(virQEMUDriverPtr driver,
- virDomainObjPtr vm);
-
int qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainDiskDefPtr disk);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d8593ba83..a980f5a9e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6271,8 +6271,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
}
}
- qemuDomainDeleteNamespace(driver, vm);
-
vm->taint = 0;
vm->pid = -1;
virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason);
--
2.11.0