From 5dd610d01d3486110f2834b835f3ed1e6703b1f5 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 15 Feb 2016 16:15:58 +0100
Subject: [PATCH] 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.
---
 src/qemu/qemu_cgroup.c | 17 ++++++++++++-----
 src/qemu/qemu_cgroup.h |  7 ++++---
 src/qemu/qemu_driver.c |  4 ++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index b37af6d34e..978dfa26f9 100644
--- 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 a31fa34fac..a8b8e1b8b5 100644
--- 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 142863e668..77f4baa430 100644
--- 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,
-- 
GitLab