qemu: driver: Remove disk source munging in qemuDomainBlockPivot

Previously there weren't any suitable functions which would allow
setting up host side of a full disk chain so we've opted to replace the
'src' in a virDomainDiskDef by the new image source.

That is now no longer necessary so remove the munging.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 79f77bfa2ff61b742a09c807859ea70dfc990f44..007c46fd992af86892f485f8e1fdabc11a2bf155 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17124,7 +17124,6 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
 {
     int ret = -1;
     qemuDomainObjPrivatePtr priv = vm->privateData;
-    virStorageSourcePtr oldsrc = NULL;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
 
     if (!disk->mirror) {
@@ -17160,21 +17159,15 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
      * has already been labeled; but only necessary when we know for
      * sure that there is a backing chain.  */
     if (disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) {
-        oldsrc = disk->src;
-        disk->src = disk->mirror;
-
         if (qemuDomainDetermineDiskChain(driver, vm, disk, disk->mirror, true) < 0)
             goto cleanup;
 
         if (disk->mirror->format &&
             disk->mirror->format != VIR_STORAGE_FILE_RAW &&
-            (qemuDomainNamespaceSetupDisk(vm, disk->src) < 0 ||
-             qemuSetupImageChainCgroup(vm, disk->src) < 0 ||
-             qemuSecuritySetImageLabel(driver, vm, disk->src, true) < 0))
+            (qemuDomainNamespaceSetupDisk(vm, disk->mirror) < 0 ||
+             qemuSetupImageChainCgroup(vm, disk->mirror) < 0 ||
+             qemuSecuritySetImageLabel(driver, vm, disk->mirror, true) < 0))
             goto cleanup;
-
-        disk->src = oldsrc;
-        oldsrc = NULL;
     }
 
     /* Attempt the pivot.  Record the attempt now, to prevent duplicate
@@ -17202,9 +17195,6 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
     }
 
  cleanup:
-    if (oldsrc)
-        disk->src = oldsrc;
-
     virObjectUnref(cfg);
     return ret;
 }