Merge ~paelzer/ubuntu/+source/libvirt:lp-1972075-JAMMY into ubuntu/+source/libvirt:ubuntu/jammy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-1972075-libvirt-gl

[Christian Ehrhardt  (paelzer)]

FYI - once merged upstream for real I'll update the commit hash

5f88cf0... by Christian Ehrhardt  on 2022-05-20

d/p/u/lp-1972075: set final upstream commit

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

FYI: Updated to final commit hash

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Christian.

Pretty much the same MP as the one for Kinetic, so the comments here are the same (including the suggestion to link to gitlab.com).

LGTM, but let's see how the autopkgtests perform.

review: Approve

[Sergio Durigan Junior (sergiodj)]

All tests passed:

Results from https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-paelzer-lp-1972075-libvirt-gl/?format=plain:
  libvirt @ amd64:
    20.05.22 18:33:19 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu7.1~jammyppa1']
  libvirt @ arm64:
    20.05.22 18:46:31 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu7.1~jammyppa1']
  libvirt @ armhf:
    20.05.22 18:40:40 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu7.1~jammyppa1']
  libvirt @ ppc64el:
    20.05.22 18:31:33 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu7.1~jammyppa1']
  libvirt @ s390x:
    20.05.22 18:28:11 Log 🗒️ ✅ Triggers: ['libvirt/8.0.0-1ubuntu7.1~jammyppa1']

318812e... by Christian Ehrhardt  on 2022-05-23

d/p/ubuntu-aa/0035-apparmor-separate-swtpm-rules.patch: fix upstream URL

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Thanks, I have updated the headers accordingly (as suggested int he other MP).

[Christian Ehrhardt  (paelzer)]

FYI: uploaded for jammy waiting for the SRU Team

diff --git a/debian/changelog b/debian/changelog
index 21d2520..b568750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvirt (8.0.0-1ubuntu7.1) jammy; urgency=medium
+
+  * d/p/u/lp-1972075-Allow-VM-to-read-sysfs-PCI-config-revision-files.patch:
+    apparmor allow new paths used for GL accelerated video (LP: #1972075)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 May 2022 08:14:48 +0200
+
 libvirt (8.0.0-1ubuntu7) jammy; urgency=medium
 
   * d/p/ubuntu-aa/0035-apparmor-separate-swtpm-rules.patch: Patch the libvirtd
diff --git a/debian/patches/series b/debian/patches/series
index b54e08b..722d026 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@ ubuntu-aa/0034-apparmor-virt-aa-helper-access-for-snapped-nova.patch
 ubuntu-aa/lp-1815910-allow-vhost-hotplug.patch
 ubuntu/swtpm-by-swtpm-user.patch
 ubuntu-aa/0035-apparmor-separate-swtpm-rules.patch
+ubuntu/lp-1972075-Allow-VM-to-read-sysfs-PCI-config-revision-files.patch
diff --git a/debian/patches/ubuntu/lp-1972075-Allow-VM-to-read-sysfs-PCI-config-revision-files.patch b/debian/patches/ubuntu/lp-1972075-Allow-VM-to-read-sysfs-PCI-config-revision-files.patch
 new file mode 100644
index 0000000..59faa28
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1972075-Allow-VM-to-read-sysfs-PCI-config-revision-files.patch
@@ -0,0 +1,45 @@
+From 28d88786af8699fb780f9c4238828afd4332d6d1 Mon Sep 17 00:00:00 2001
+From: Max Goodhart <[e-mail]>
+Date: Wed, 11 May 2022 15:08:39 -0700
+Subject: [PATCH] Allow VM to read sysfs PCI config, revision files
+
+This fixes a blank screen when viewing a VM with virtio graphics and
+gl-accelerated Spice display on Ubuntu 22.04 / libvirt 8.0.0 / qemu 6.2.
+
+Without these AppArmor permissions, the libvirt error log contains
+repetitions of:
+
+qemu_spice_gl_scanout_texture: failed to get fd for texture
+
+This appears to be similar to this GNOME Boxes issue:
+https://gitlab.gnome.org/GNOME/gnome-boxes/-/issues/586
+
+Fixes: https://launchpad.net/bugs/1972075
+
+Signed-off-by: Max Goodhart <[e-mail]>
+Reviewed-by: Christian Ehrhardt <[e-mail]>
+
+Origin: upstream, https://gitlab.com/libvirt/libvirt/-/commit/42cb548045
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1972075
+Last-Update: 2022-05-19
+
+---
+ src/security/virt-aa-helper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
+index 1f1cce8b3d..b314d2a059 100644
+--- a/src/security/virt-aa-helper.c
++++ b/src/security/virt-aa-helper.c
+@@ -1316,7 +1316,7 @@ get_files(vahControl * ctl)
+         virBufferAddLit(&buf, "  \"/dev/nvidiactl\" rw,\n");
+         virBufferAddLit(&buf, "  # Probe DRI device attributes\n");
+         virBufferAddLit(&buf, "  \"/dev/dri/\" r,\n");
+-        virBufferAddLit(&buf, "  \"/sys/devices/**/{uevent,vendor,device,subsystem_vendor,subsystem_device}\" r,\n");
++        virBufferAddLit(&buf, "  \"/sys/devices/**/{uevent,vendor,device,subsystem_vendor,subsystem_device,config,revision}\" r,\n");
+         virBufferAddLit(&buf, "  # dri libs will trigger that, but t is not requited and DAC would deny it anyway\n");
+         virBufferAddLit(&buf, "  deny \"/var/lib/libvirt/.cache/\" w,\n");
+     }
+-- 
+2.36.0
+