NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: check backing chains even when cgroup is omitted

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=896685 points out
a regression caused by commit 38c4a9c - libvirt only labels
the backing chain if the backing chain cache is populated, but
the code to populate the cache was only conditionally performed
if cgroup labeling was necessary.

* src/qemu/qemu_cgroup.c (qemuSetupCgroup): Hoist cache setup...
* src/qemu/qemu_process.c (qemuProcessStart): ...earlier into
caller, where it is now unconditional.
This commit is contained in:
Eric Blake 2013-02-20 15:34:48 -07:00
parent 9a3053e685
commit 82d5fe5437
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_cgroup.c
View File

@ -234,9 +234,7 @@ int qemuSetupCgroup(virQEMUDriverPtr driver,
} }
for (i = 0; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks ; i++) {
if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i], if (qemuSetupDiskCgroup(vm, cgroup, vm->def->disks[i]) < 0)
false) < 0 ||
qemuSetupDiskCgroup(vm, cgroup, vm->def->disks[i]) < 0)
goto cleanup; goto cleanup;
} }

5
src/qemu/qemu_process.c
View File

@ -3706,6 +3706,11 @@ int qemuProcessStart(virConnectPtr conn,
goto cleanup; goto cleanup;
VIR_DEBUG("Checking for CDROM and floppy presence"); VIR_DEBUG("Checking for CDROM and floppy presence");
for (i = 0; i < vm->def->ndisks ; i++) {
if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i],
false) < 0)
goto cleanup;
}
if (qemuDomainCheckDiskPresence(driver, vm, if (qemuDomainCheckDiskPresence(driver, vm,
flags & VIR_QEMU_PROCESS_START_COLD) < 0) flags & VIR_QEMU_PROCESS_START_COLD) < 0)
goto cleanup; goto cleanup;