]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: process: Simplify access to individual disk when reconnecting
authorPeter Krempa <pkrempa@redhat.com>
Thu, 5 Oct 2017 12:00:08 +0000 (14:00 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 6 Oct 2017 06:48:10 +0000 (08:48 +0200)
Add a helper variable so that we don't have to access the disk via 3
indirections.

src/qemu/qemu_process.c

index f29228bc1bbad573b2cf694e1df9400a023cc94a..4353ad5ec0e824d0c7ecae9a895c5babecae1abb 100644 (file)
@@ -6969,21 +6969,21 @@ qemuProcessReconnect(void *opaque)
      * qemu_driver->sharedDevices.
      */
     for (i = 0; i < obj->def->ndisks; i++) {
+        virDomainDiskDefPtr disk = obj->def->disks[i];
         virDomainDeviceDef dev;
 
-        if (virStorageTranslateDiskSourcePool(conn, obj->def->disks[i]) < 0)
+        if (virStorageTranslateDiskSourcePool(conn, disk) < 0)
             goto error;
 
         /* XXX we should be able to restore all data from XML in the future.
          * This should be the only place that calls qemuDomainDetermineDiskChain
          * with @report_broken == false to guarantee best-effort domain
          * reconnect */
-        if (qemuDomainDetermineDiskChain(driver, obj, obj->def->disks[i],
-                                         true, false) < 0)
+        if (qemuDomainDetermineDiskChain(driver, obj, disk, true, false) < 0)
             goto error;
 
         dev.type = VIR_DOMAIN_DEVICE_DISK;
-        dev.data.disk = obj->def->disks[i];
+        dev.data.disk = disk;
         if (qemuAddSharedDevice(driver, &dev, obj->def->name) < 0)
             goto error;
     }