From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 30 Jun 2014 13:40:57 +0000 (+0200)
Subject: qemu: Don't propagate whole disk definition into qemuDomainGetImageIds
X-Git-Tag: v1.2.7-rc1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e7cd8866ca8cabfda22de13b67c09227cff3561;p=thirdparty%2Flibvirt.git

qemu: Don't propagate whole disk definition into qemuDomainGetImageIds

It will help re-using the function.
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0e1c2631f7..5ec57653c8 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -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,