This does not change behavior, but it eliminates direct usage of 'cfg->user' which makes for easier auditing
Signed-off-by: Cole Robinson <[email protected]> --- src/qemu/qemu_domain.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a0f41c436e..83d4bb124e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10696,17 +10696,12 @@ qemuDomainOpenFile(virQEMUDriverConfig *cfg, int oflags, bool *needUnlink) { - uid_t user = cfg->user; - gid_t group = cfg->group; bool dynamicOwnership = cfg->dynamicOwnership; - virSecurityLabelDef *seclabel; + uid_t uid; + gid_t gid; - if (def && - (seclabel = virDomainDefGetSecurityLabelDef(def, "dac")) != NULL && - seclabel->label != NULL) - virParseOwnershipIds(seclabel->label, &user, &group); - - return virQEMUFileOpenAs(user, group, dynamicOwnership, + qemuDomainGetImageIds(cfg, def, NULL, NULL, &uid, &gid); + return virQEMUFileOpenAs(uid, gid, dynamicOwnership, path, oflags, needUnlink); } -- 2.53.0
