[PATCH v3 10/10] qemu: Make auto dump path generation embed driver aware
So far, libvirt generates the following path for automatic dumps:
$autoDumpPath/$id-$shortName-$timestamp
where $autoDumpPath is where libvirt stores dumps of guests (e.g.
/var/lib/libvirt/qemu/dump), $id is domain ID and $shortName is
shortened version of domain name. So for instance, the generated
path may look something like this:
/var/lib/libvirt/qemu/dump/1-QEMUGuest-2020-03-25-10:40:50
While in case of embed driver the following path would be
generated by default:
$root/lib/libvirt/qemu/dump/1-QEMUGuest-2020-03-25-10:40:50
which is not clashing with other embed drivers, we allow users to
override the default and have all embed drivers use the same
prefix. This can create clashing paths. Fortunately, we can reuse
the approach for machined name generation
(v6.1.0-178-gc9bd08ee35) and include part of hash of the root in
the generated path.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_driver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 33f177adbd..1746c85be4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4104,6 +4104,7 @@ static char *
getAutoDumpPath(virQEMUDriverPtr driver,
virDomainObjPtr vm)
{
+ const char *root = driver->embeddedRoot;
g_autofree char *domname = virDomainDefGetShortName(vm->def);
g_autoptr(GDateTime) now = g_date_time_new_now_local();
g_autofree char *nowstr = NULL;
@@ -4116,6 +4117,11 @@ getAutoDumpPath(virQEMUDriverPtr driver,
nowstr = g_date_time_format(now, "%Y-%m-%d-%H:%M:%S");
+ if (root && !STRPREFIX(cfg->autoDumpPath, root)) {
+ g_autofree char * hash = virDomainDriverGenerateRootHash(QEMU_DRIVER_NAME,
root);
+ return g_strdup_printf("%s/%s-%s-%s", cfg->autoDumpPath, hash,
domname, nowstr);
+ }
+
return g_strdup_printf("%s/%s-%s", cfg->autoDumpPath, domname, nowstr);
}
--
2.24.1