[PATCH 01/16] qemu: require non-NULL 'cfg' in qemuDomainGetImageIds()

[Cole Robinson via Devel]

Every caller passes this in, we can depend on it being non-NULL.

Signed-off-by: Cole Robinson <crobi...@redhat.com>
---
 src/qemu/qemu_domain.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d4bd2a0b98..f494c6469b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6285,17 +6285,9 @@ qemuDomainGetImageIds(virQEMUDriverConfig *cfg,
     virSecurityDeviceLabelDef *disklabel;
 
     if (uid)
-        *uid = -1;
+        *uid = cfg->user;
     if (gid)
-        *gid = -1;
-
-    if (cfg) {
-        if (uid)
-            *uid = cfg->user;
-
-        if (gid)
-            *gid = cfg->group;
-    }
+        *gid = cfg->group;
 
     if ((vmlabel = virDomainDefGetSecurityLabelDef(def, "dac")) &&
         vmlabel->label)
-- 
2.53.0