]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Drop qemuDomainDeleteNamespace
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 6 Jan 2017 09:56:01 +0000 (10:56 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 10 Jan 2017 12:04:57 +0000 (13:04 +0100)
After previous commits, this function is no longer needed.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_domain.c
src/qemu/qemu_domain.h
src/qemu/qemu_process.c

index 137d68e47b495fff0bdc4388d74733e9c9d63573..01765dc281af531c21aae85faa03ef48ca374c73 100644 (file)
@@ -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;
index cce879f763c32fcad847d4841bf7fee975ce3383..88b5869725cbc234f78c94bf6bba5c69f496a73a 100644 (file)
@@ -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);
index d8593ba837ab5d918f3d79ed75416710ea0848ab..a980f5a9e524b335796b7fbb12095c9ff4166a58 100644 (file)
@@ -6271,8 +6271,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
         }
     }
 
-    qemuDomainDeleteNamespace(driver, vm);
-
     vm->taint = 0;
     vm->pid = -1;
     virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason);