[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] Fix build with apparmor



Recent storage patches changed signature of virStorageFileGetMetadata
and replaced chain with backingChain in virDomainDiskDef.
---
 src/security/virt-aa-helper.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 263fc92..c3a9265 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -924,10 +924,12 @@ get_files(vahControl * ctl)
         /* XXX - if we knew the qemu user:group here we could send it in
          *        so that the open could be re-tried as that user:group.
          */
-        disk->chain = virStorageFileGetMetadata(disk->src, disk->format,
-                                                -1, -1,
-                                                ctl->allowDiskFormatProbing,
-                                                NULL);
+        if (!disk->backingChain) {
+            bool probe = ctl->allowDiskFormatProbing;
+            disk->backingChain = virStorageFileGetMetadata(disk->src,
+                                                           disk->format,
+                                                           -1, -1, probe);
+        }
 
         /* XXX passing ignoreOpenFailure = true to get back to the behavior
          * from before using virDomainDiskDefForeachPath. actually we should
-- 
1.7.12.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]