提交 5dd610d0 编写于 作者: P Peter Krempa

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.
上级 4e22355e
......@@ -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;
}
......
......@@ -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,
......
......@@ -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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册