[7/7] security: apparmor: Make storage_source_add_files recursively callable

Message ID 70ec368459c0bdd748dec360de106c0f9423bd8e.1570551720.git.crobinso@redhat.com
State Accepted
Commit 3a15c47253f30f6e048bbf2f9b3b8082de9d9ea3
Headers show
Series
  • security: apparmor: prep for qcow2 data_file
Related show

Commit Message

Cole Robinson Oct. 8, 2019, 4:22 p.m.
This will simplify adding support for qcow2 external data_file

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 src/security/virt-aa-helper.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patch

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index b675572144..d9f6b5638b 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -939,9 +939,9 @@  add_file_path(virStorageSourcePtr src,
 
 static int
 storage_source_add_files(virStorageSourcePtr src,
-                         virBufferPtr buf)
+                         virBufferPtr buf,
+                         size_t depth)
 {
-    size_t depth = 0;
     virStorageSourcePtr tmp;
 
     for (tmp = src; virStorageSourceIsBacking(tmp); tmp = tmp->backingStore) {
@@ -994,7 +994,7 @@  get_files(vahControl * ctl)
 
          /* XXX should handle open errors more careful than just ignoring them.
          */
-        if (storage_source_add_files(disk->src, &buf) < 0)
+        if (storage_source_add_files(disk->src, &buf, 0) < 0)
             goto cleanup;
     }