From 0dea832ada55988519062751d8aa79f0cf101016 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 23 Apr 2015 20:16:30 -0400 Subject: [PATCH] qemu: conf: Clarify paths that are relative to libDir Rather than duplicate libDir for each new path (cherry picked from commit c19f43ae7e69103b9db59be1dcab6f8236fa1b24) --- src/qemu/qemu_conf.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2cf3905a3e..88a067a4a5 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -192,21 +192,18 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) "%s/run/libvirt/qemu", LOCALSTATEDIR) < 0) goto error; - if (virAsprintf(&cfg->libDir, - "%s/lib/libvirt/qemu", LOCALSTATEDIR) < 0) - goto error; - if (virAsprintf(&cfg->cacheDir, "%s/cache/libvirt/qemu", LOCALSTATEDIR) < 0) goto error; - if (virAsprintf(&cfg->saveDir, - "%s/lib/libvirt/qemu/save", LOCALSTATEDIR) < 0) + + if (virAsprintf(&cfg->libDir, + "%s/lib/libvirt/qemu", LOCALSTATEDIR) < 0) goto error; - if (virAsprintf(&cfg->snapshotDir, - "%s/lib/libvirt/qemu/snapshot", LOCALSTATEDIR) < 0) + if (virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir) < 0) goto error; - if (virAsprintf(&cfg->autoDumpPath, - "%s/lib/libvirt/qemu/dump", LOCALSTATEDIR) < 0) + if (virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir) < 0) + goto error; + if (virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir) < 0) goto error; } else { char *rundir;