External/libvirt
1
0
Fork 0
Code

qemuVirtioFSStop: Simplify daemon kill

Browse Source 
Now, that we know that the virtiofsd will have the pidfile open
and locked we can use virPidFileForceCleanupPath() to kill it and
unlink the pidfile.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Michal Privoznik 2020-03-13 17:03:10 +01:00
parent 1566be99be
commit a8db4dc31f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_virtiofs.c
View File

@ -36,6 +36,8 @@
#define VIR_FROM_THIS VIR_FROM_QEMU #define VIR_FROM_THIS VIR_FROM_QEMU
VIR_LOG_INIT("qemu.virtiofs");
char * char *
qemuVirtioFSCreatePidFilename(virDomainObjPtr vm, qemuVirtioFSCreatePidFilename(virDomainObjPtr vm,
@ -271,28 +273,19 @@ qemuVirtioFSStop(virQEMUDriverPtr driver G_GNUC_UNUSED,
{ {
g_autofree char *pidfile = NULL; g_autofree char *pidfile = NULL;
virErrorPtr orig_err; virErrorPtr orig_err;
pid_t pid = -1;
int rc;
virErrorPreserveLast(&orig_err); virErrorPreserveLast(&orig_err);
if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias))) if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias)))
goto cleanup; goto cleanup;
rc = virPidFileReadPathIfAlive(pidfile, &pid, NULL); if (virPidFileForceCleanupPath(pidfile) < 0) {
if (rc >= 0 && pid != (pid_t) -1) VIR_WARN("Unable to kill virtiofsd process");
virProcessKillPainfully(pid, true); } else {
if (QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock)
if (unlink(pidfile) < 0 && unlink(QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock);
errno != ENOENT) {
virReportSystemError(errno,
_("Unable to remove stale pidfile %s"),
pidfile);
} }
if (QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock)
unlink(QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock);
cleanup: cleanup:
virErrorRestore(&orig_err); virErrorRestore(&orig_err);
} }