a41c76
From aa95c0fea0aa938873717ccb91319b2c3e48d000 Mon Sep 17 00:00:00 2001
a41c76
Message-Id: <aa95c0fea0aa938873717ccb91319b2c3e48d000@dist-git>
a41c76
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
a41c76
Date: Tue, 24 Mar 2020 11:30:17 +0100
a41c76
Subject: [PATCH] qemu: virtiofs: shorten pid filename
a41c76
MIME-Version: 1.0
a41c76
Content-Type: text/plain; charset=UTF-8
a41c76
Content-Transfer-Encoding: 8bit
a41c76
a41c76
There is no need to repeat the shortName, since it's
a41c76
already present in the directory path.
a41c76
a41c76
Also use just 'fs' instead of 'virtiofsd'.
a41c76
a41c76
https://bugzilla.redhat.com/show_bug.cgi?id=1816577
a41c76
a41c76
Signed-off-by: Ján Tomko <jtomko@redhat.com>
a41c76
Suggested-by: Andrea Bolognani <abologna@redhat.com>
a41c76
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
a41c76
(cherry picked from commit 7055af6c2253666cd0b7c4c459c5a019da789140)
a41c76
Signed-off-by: Ján Tomko <jtomko@redhat.com>
a41c76
Message-Id: <619956878ec3e09fe6481c7e25b2820753aa57e5.1585045801.git.jtomko@redhat.com>
a41c76
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
a41c76
---
a41c76
 src/qemu/qemu_virtiofs.c | 6 +-----
a41c76
 1 file changed, 1 insertion(+), 5 deletions(-)
a41c76
a41c76
diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
a41c76
index d579ce1d33..b47e19a562 100644
a41c76
--- a/src/qemu/qemu_virtiofs.c
a41c76
+++ b/src/qemu/qemu_virtiofs.c
a41c76
@@ -42,13 +42,9 @@ qemuVirtioFSCreatePidFilename(virDomainObjPtr vm,
a41c76
                               const char *alias)
a41c76
 {
a41c76
     qemuDomainObjPrivatePtr priv = vm->privateData;
a41c76
-    g_autofree char *shortName = NULL;
a41c76
     g_autofree char *name = NULL;
a41c76
 
a41c76
-    if (!(shortName = virDomainDefGetShortName(vm->def)))
a41c76
-        return NULL;
a41c76
-
a41c76
-    name = g_strdup_printf("%s-%s-virtiofsd", shortName, alias);
a41c76
+    name = g_strdup_printf("%s-fs", alias);
a41c76
 
a41c76
     return virPidFileBuildPath(priv->libDir, name);
a41c76
 }
a41c76
-- 
a41c76
2.26.0
a41c76