From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 23 Mar 2020 15:46:03 +0000 (+0100)
Subject: qemu: virtiofs: shorten pid filename
X-Git-Tag: v6.2.0-rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7055af6c2253666cd0b7c4c459c5a019da789140;p=thirdparty%2Flibvirt.git

qemu: virtiofs: shorten pid filename

There is no need to repeat the shortName, since it's
already present in the directory path.

Also use just 'fs' instead of 'virtiofsd'.

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

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Suggested-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
index d579ce1d33..b47e19a562 100644
--- a/src/qemu/qemu_virtiofs.c
+++ b/src/qemu/qemu_virtiofs.c
@@ -42,13 +42,9 @@ qemuVirtioFSCreatePidFilename(virDomainObjPtr vm,
                               const char *alias)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
-    g_autofree char *shortName = NULL;
     g_autofree char *name = NULL;
 
-    if (!(shortName = virDomainDefGetShortName(vm->def)))
-        return NULL;
-
-    name = g_strdup_printf("%s-%s-virtiofsd", shortName, alias);
+    name = g_strdup_printf("%s-fs", alias);
 
     return virPidFileBuildPath(priv->libDir, name);
 }