From: Martin Kletzander <mkletzan@redhat.com>
Date: Tue, 26 Apr 2016 07:44:18 +0000 (+0200)
Subject: Shorten domain name for automatic coredump
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d294f6b0dff7;p=libvirt.git

Shorten domain name for automatic coredump

If the domain name is long enough, the timestamp can prolong the
filename for automatic coredump to more than the filesystem's limit.
Simply shorten it like we do in other places.  The timestamp helps with
the unification, but having the ID in the name won't hurt.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1289363

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 542d13c2ac..5992492ebd 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3965,13 +3965,17 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver,
     char timestr[100];
     struct tm time_info;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
+    char *domname = virDomainObjGetShortName(vm);
+
+    if (!domname)
+        goto cleanup;
 
     localtime_r(&curtime, &time_info);
     strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info);
 
     if (virAsprintf(&dumpfile, "%s/%s-%s",
                     cfg->autoDumpPath,
-                    vm->def->name,
+                    domname,
                     timestr) < 0)
         goto cleanup;
 
@@ -3984,6 +3988,7 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver,
                        "%s", _("Dump failed"));
  cleanup:
     VIR_FREE(dumpfile);
+    VIR_FREE(domname);
     virObjectUnref(cfg);
     return ret;
 }