[libvirt] [PATCHv4 02/29] qemu: Don't propagate whole disk definition into qemuDomainGetImageIds
It will help re-using the function.
---
src/qemu/qemu_domain.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9e38d02..37b28ab 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2400,7 +2400,7 @@ qemuDomainCleanupRun(virQEMUDriverPtr driver,
static void
qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg,
virDomainObjPtr vm,
- virDomainDiskDefPtr disk,
+ virStorageSourcePtr src,
uid_t *uid, gid_t *gid)
{
virSecurityLabelDefPtr vmlabel;
@@ -2423,7 +2423,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);
}
@@ -2452,7 +2452,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,
--
1.9.3