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_driver.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 59b9601360..0cfd42b0e1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11756,6 +11756,8 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, g_autoptr(virCPUDef) cpu = NULL; virArch arch; virDomainVirtType virttype; + uid_t uid; + gid_t gid; virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE | VIR_CONNECT_COMPARE_CPU_VALIDATE_XML, @@ -11810,8 +11812,10 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, return VIR_CPU_COMPARE_ERROR; } } + + qemuDomainGetImageIds(cfg, NULL, NULL, NULL, &uid, &gid); return qemuConnectCPUModelComparison(qemuCaps, cfg->libDir, - cfg->user, cfg->group, + uid, gid, hvCPU, cpu, failIncompatible); } @@ -11996,6 +12000,8 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, g_auto(GStrv) features = NULL; unsigned int physAddrSize = 0; size_t i; + uid_t uid; + gid_t gid; virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES | VIR_CONNECT_BASELINE_CPU_MIGRATABLE | @@ -12057,8 +12063,9 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { bool expand_features = (flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES); + qemuDomainGetImageIds(cfg, NULL, NULL, NULL, &uid, &gid); if (!(cpu = qemuConnectCPUModelBaseline(qemuCaps, cfg->libDir, - cfg->user, cfg->group, + uid, gid, expand_features, cpus, ncpus, cpuModels))) goto cleanup; -- 2.53.0
