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