From 7ed6934f3b925fa53177e0ddf6bd6b75ac5a0116 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 29 Nov 2016 08:36:30 +0100
Subject: [PATCH] virDomainObjGetShortName: take virDomainDef

So far this function takes virDomainObjPtr which:
1) is an overkill,
2) might be not available in all the places we will use it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/domain_conf.c | 4 ++--
 src/conf/domain_conf.h | 2 +-
 src/qemu/qemu_domain.c | 2 +-
 src/qemu/qemu_driver.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b6d1bf1621..7715cadbdc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25701,13 +25701,13 @@ virDomainDefHasMemballoon(const virDomainDef *def)
  * Shorten domain name to avoid possible path length limitations.
  */
 char *
-virDomainObjGetShortName(virDomainObjPtr vm)
+virDomainObjGetShortName(const virDomainDef *def)
 {
     const int dommaxlen = 20;
     char *ret = NULL;
 
     ignore_value(virAsprintf(&ret, "%d-%.*s",
-                             vm->def->id, dommaxlen, vm->def->name));
+                             def->id, dommaxlen, def->name));
 
     return ret;
 }
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 747c11e3d7..c9f2bf3d9b 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3205,7 +3205,7 @@ int virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
 
 bool virDomainDefHasMemballoon(const virDomainDef *def) ATTRIBUTE_NONNULL(1);
 
-char *virDomainObjGetShortName(virDomainObjPtr vm);
+char *virDomainObjGetShortName(const virDomainDef *def) ATTRIBUTE_NONNULL(1);
 
 int
 virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def,
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4aae14d9d1..d3e505b176 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1475,7 +1475,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver,
 {
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
     qemuDomainObjPrivatePtr priv = vm->privateData;
-    char *domname = virDomainObjGetShortName(vm);
+    char *domname = virDomainObjGetShortName(vm->def);
     int ret = -1;
 
     if (!domname)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6b177e9e5b..3f4e06bc3f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3885,7 +3885,7 @@ getAutoDumpPath(virQEMUDriverPtr driver,
                 virDomainObjPtr vm)
 {
     char *dumpfile = NULL;
-    char *domname = virDomainObjGetShortName(vm);
+    char *domname = virDomainObjGetShortName(vm->def);
     char timestr[100];
     struct tm time_info;
     time_t curtime = time(NULL);
-- 
GitLab