qemu: cgroup: Switch to qemu(Setup|Teardown)ImageCgroup

For other objects we use the two functions rather than one with a bool.
Convert qemuSetImageCgroup to the same approach.

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index b37af6d34efa75dd5b031f030766475713b449b1..978dfa26f9fd088c8f31bb8d4932157c3a7814b3 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -99,11 +99,18 @@ qemuSetImageCgroupInternal(virDomainObjPtr vm,
 
 
 int
-qemuSetImageCgroup(virDomainObjPtr vm,
-                   virStorageSourcePtr src,
-                   bool deny)
+qemuSetupImageCgroup(virDomainObjPtr vm,
+                     virStorageSourcePtr src)
 {
-    return qemuSetImageCgroupInternal(vm, src, deny, false);
+    return qemuSetImageCgroupInternal(vm, src, false, false);
+}
+
+
+int
+qemuTeardownImageCgroup(virDomainObjPtr vm,
+                        virStorageSourcePtr src)
+{
+    return qemuSetImageCgroupInternal(vm, src, true, false);
 }
 
 
@@ -133,7 +140,7 @@ qemuTeardownDiskCgroup(virDomainObjPtr vm,
     virStorageSourcePtr next;
 
     for (next = disk->src; next; next = next->backingStore) {
-        if (qemuSetImageCgroup(vm, next, true) < 0)
+        if (qemuSetImageCgroupInternal(vm, next, true, false) < 0)
             return -1;
     }
 

diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index a31fa34fac77c7137ecb4a89a765ae2bffc2d7d4..a8b8e1b8b5866136aa804ef9e037c0c6c3bf1870 100644 (file)
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -29,9 +29,10 @@
 # include "domain_conf.h"
 # include "qemu_conf.h"
 
-int qemuSetImageCgroup(virDomainObjPtr vm,
-                       virStorageSourcePtr src,
-                       bool deny);
+int qemuSetupImageCgroup(virDomainObjPtr vm,
+                         virStorageSourcePtr src);
+int qemuTeardownImageCgroup(virDomainObjPtr vm,
+                            virStorageSourcePtr src);
 int qemuSetupDiskCgroup(virDomainObjPtr vm,
                         virDomainDiskDefPtr disk);
 int qemuTeardownDiskCgroup(virDomainObjPtr vm,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 142863e668112dd83596331dabbefaf30cd62ec2..77f4baa4302d5fa757c56a434b5e822c4bea580a 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13373,7 +13373,7 @@ qemuDomainPrepareDiskChainElement(virQEMUDriverPtr driver,
                                                 vm->def, elem) < 0)
             VIR_WARN("Unable to restore security label on %s", elem->path);
 
-        if (qemuSetImageCgroup(vm, elem, true) < 0)
+        if (qemuTeardownImageCgroup(vm, elem) < 0)
             VIR_WARN("Failed to teardown cgroup for disk path %s", elem->path);
 
         if (virDomainLockImageDetach(driver->lockManager, vm, elem) < 0)
@@ -13383,7 +13383,7 @@ qemuDomainPrepareDiskChainElement(virQEMUDriverPtr driver,
                                      vm, elem) < 0)
             goto cleanup;
 
-        if (qemuSetImageCgroup(vm, elem, false) < 0)
+        if (qemuSetupImageCgroup(vm, elem) < 0)
             goto cleanup;
 
         if (virSecurityManagerSetImageLabel(driver->securityManager,