External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
For other objects we use the two functions rather than one with a bool.
Convert qemuSetImageCgroup to the same approach.
This commit is contained in:
Peter Krempa 2016-02-15 16:15:58 +01:00
parent 4e22355ee1
commit 5dd610d01d
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_cgroup.c
View File

@ -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;
}

7
src/qemu/qemu_cgroup.h
View File

@ -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,

4
src/qemu/qemu_driver.c
View File

@ -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,