qemu: Do not keep swtpm pidfile around after stopping

Just like the socket, remove the pidfile when TPM emulator is being stopped.  In
order to make this a bit cleaner, try to remove it even if swtpm_ioctl does not
exist.

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

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index d0aed7fa2eb70ee87b0d00b0718167bb8e1caae5..20e38ceaa26b543e22a7e7dbef02622600322db5 100644 (file)
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -787,26 +787,24 @@ qemuTPMEmulatorStop(const char *swtpmStateDir,
     g_autofree char *pathname = NULL;
     g_autofree char *errbuf = NULL;
     g_autofree char *swtpm_ioctl = virTPMGetSwtpmIoctl();
+    g_autofree char *pidfile = qemuTPMEmulatorPidFileBuildPath(swtpmStateDir,
+                                                               shortName);
+    if (swtpm_ioctl &&
+        (pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName)) &&
+        virFileExists(pathname)) {
 
-    if (!swtpm_ioctl)
-        return;
-
-    if (!(pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName)))
-        return;
-
-    if (!virFileExists(pathname))
-        return;
-
-    cmd = virCommandNew(swtpm_ioctl);
+        cmd = virCommandNewArgList(swtpm_ioctl, "--unix", pathname, "-s", NULL);
 
-    virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL);
+        virCommandSetErrorBuffer(cmd, &errbuf);
 
-    virCommandSetErrorBuffer(cmd, &errbuf);
+        ignore_value(virCommandRun(cmd, NULL));
 
-    ignore_value(virCommandRun(cmd, NULL));
+        /* clean up the socket */
+        unlink(pathname);
+    }
 
-    /* clean up the socket */
-    unlink(pathname);
+    if (pidfile)
+        virPidFileForceCleanupPath(pidfile);
 }