Merge ~lvoytek/ubuntu/+source/libvirt:fix-pid-duplication-lunar into ubuntu/+source/libvirt:ubuntu/devel

[Lena Voytek]

Cleaning up swtpm pid file after a vm shuts down

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/libvirt-fix-swtpm-pid-duplication

Testing:

# apt install virt-manager swtpm

Create a vm in virt-manager and on the last page

> Select "Customize configuration before install"
> Click Finish

> Click Add Hardware
> Select TPM with Model "TIS" and version 2.0

> Click "Begin Installation"

Turn the vm off and on a few times then check /run/libvirt/qemu/swtpm:

# ls -la /run/libvirt/qemu/swtpm

In the original version multiple pid files will show up, e.g.

drwxrwx--- 2 libvirt-qemu swtpm 80 Nov 17 13:34 .
drwxr-xr-x 5 root root 180 Nov 17 13:34 ..
-rw-r--r-- 1 root root 5 Nov 17 12:57 1-win11-swtpm.pid
-rw-r--r-- 1 root root 5 Nov 17 13:34 2-win11-swtpm.pid

[Christian Ehrhardt  (paelzer)]

LGTM +1
I'd like to save the builders and tests some effort and combine it with others.

WDYT of
https://code.launchpad.net/~paelzer/ubuntu/+source/libvirt/+git/libvirt/+merge/433429

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, lvoytek
Uploaders: paelzer
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 22a9983..d3ccbfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvirt (8.6.0-0ubuntu4) lunar; urgency=medium
+
+  * d/p/u/fix-swtpm-pid-duplication.patch: Clean up swtpm pids after a vm
+    shuts down (LP: #1997269)
+
+ -- Lena Voytek <[e-mail]>  Mon, 21 Nov 2022 11:16:40 -0700
+
 libvirt (8.6.0-0ubuntu3) kinetic; urgency=medium
 
   * d/p/u/lp-1990499-virt-aa-helper-allow-common-riscv64-loader-paths.patch:
diff --git a/debian/patches/series b/debian/patches/series
index c2f6adb..8d27373 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,7 @@ ubuntu/lp-1861125-ubuntu-models.patch
 ubuntu/dnsmasq-as-priv-user
 ubuntu/ovmf_paths.patch
 ubuntu/wait-for-qemu-kvm.patch
+ubuntu/lp-1997269-fix-swtpm-pid-duplication.patch
 
 # Ubuntu Apparmor Changes
 ubuntu-aa/0020-virt-aa-helper-ubuntu-storage-paths.patch
diff --git a/debian/patches/ubuntu/lp-1997269-fix-swtpm-pid-duplication.patch b/debian/patches/ubuntu/lp-1997269-fix-swtpm-pid-duplication.patch
new file mode 100644
index 0000000..ac4dfc9
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1997269-fix-swtpm-pid-duplication.patch
@@ -0,0 +1,52 @@
+Description: Do not keep swtpm pidfile around after stopping qemu vm
+Author: Martin Kletzander <[e-mail]>
+Origin: upstream, https://gitlab.com/libvirt/libvirt/-/commit/3c2d06d78e1bd2d9298276b44a6ab09cc3b36e5a
+Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2111301
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1997269
+Last-Update: 2022-11-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/qemu/qemu_tpm.c
++++ b/src/qemu/qemu_tpm.c
+@@ -793,28 +793,25 @@
+     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)
+-        return;
++    if (swtpm_ioctl &&
++        (pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName)) &&
++        virFileExists(pathname)) {
+ 
+-    if (!(pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName)))
+-        return;
++        cmd = virCommandNewArgList(swtpm_ioctl, "--unix", pathname, "-s", NULL);
+ 
+-    if (!virFileExists(pathname))
+-        return;
++        virCommandSetErrorBuffer(cmd, &errbuf);
+ 
+-    cmd = virCommandNew(swtpm_ioctl);
+-    if (!cmd)
+-        return;
++        ignore_value(virCommandRun(cmd, NULL));
+ 
+-    virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL);
++        /* clean up the socket */
++        unlink(pathname);
++    }
+ 
+-    virCommandSetErrorBuffer(cmd, &errbuf);
+-
+-    ignore_value(virCommandRun(cmd, NULL));
+-
+-    /* clean up the socket */
+-    unlink(pathname);
++    if (pidfile)
++        virPidFileForceCleanupPath(pidfile);
+ }
+ 
+