]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Don't propagate whole disk definition into qemuDomainGetImageIds
authorPeter Krempa <pkrempa@redhat.com>
Mon, 30 Jun 2014 13:40:57 +0000 (15:40 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 8 Jul 2014 12:27:18 +0000 (14:27 +0200)
It will help re-using the function.

src/qemu/qemu_domain.c

index 0e1c2631f7b17440bf634214d4ef5bad57f41b9d..5ec57653c8faafbf4797aa8b66c158ee1876b47f 100644 (file)
@@ -2408,7 +2408,7 @@ qemuDomainCleanupRun(virQEMUDriverPtr driver,
 static void
 qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg,
                       virDomainObjPtr vm,
-                      virDomainDiskDefPtr disk,
+                      virStorageSourcePtr src,
                       uid_t *uid, gid_t *gid)
 {
     virSecurityLabelDefPtr vmlabel;
@@ -2431,7 +2431,7 @@ qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg,
         vmlabel->label)
         virParseOwnershipIds(vmlabel->label, uid, gid);
 
-    if ((disklabel = virStorageSourceGetSecurityLabelDef(disk->src, "dac")) &&
+    if ((disklabel = virStorageSourceGetSecurityLabelDef(src, "dac")) &&
         disklabel->label)
         virParseOwnershipIds(disklabel->label, uid, gid);
 }
@@ -2460,7 +2460,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
             goto cleanup;
     }
 
-    qemuDomainGetImageIds(cfg, vm, disk, &uid, &gid);
+    qemuDomainGetImageIds(cfg, vm, disk->src, &uid, &gid);
 
     if (virStorageFileGetMetadata(disk->src,
                                   uid, gid,