From 406e39096270736fc8e06ff905884f3652d61578 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 6 Jan 2017 10:56:01 +0100 Subject: [PATCH] qemu: Drop qemuDomainDeleteNamespace After previous commits, this function is no longer needed. Signed-off-by: Michal Privoznik --- 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 137d68e47b..01765dc281 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 cce879f763..88b5869725 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 d8593ba837..a980f5a9e5 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);