Index: libvirt-5.4.0/src/security/virt-aa-helper.c
===================================================================
--- libvirt-5.4.0.orig/src/security/virt-aa-helper.c
+++ libvirt-5.4.0/src/security/virt-aa-helper.c
@@ -953,14 +953,12 @@ get_files(vahControl * ctl)
         goto cleanup;
     }

-    /* load the storage driver so that backing store can be accessed */
-#ifdef WITH_STORAGE
-    virDriverLoadModule("storage", "storageRegister", false);
-#endif
-
     for (i = 0; i < ctl->def->ndisks; i++) {
         virDomainDiskDefPtr disk = ctl->def->disks[i];

+        if (virDomainDiskTranslateSourcePool(disk) < 0)
+            continue;
+
         if (!virDomainDiskGetSource(disk))
             continue;
         /* XXX - if we knew the qemu user:group here we could send it in
Index: libvirt-5.4.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
--- libvirt-5.4.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+++ libvirt-5.4.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -6,6 +6,9 @@ profile virt-aa-helper /usr/{lib,lib64}/
   #include <abstractions/nameservice>
   #include <abstractions/user-tmp>

+  # allow to read libvirt client config
+  /etc/libvirt/libvirt.conf r,
+
   # needed for searching directories
   capability dac_override,
   capability dac_read_search,