fix bug in qemuSetupCgroupForEmulator

Should not return 0 when failed to setup cgroup.
This commit is contained in:
Hu Tao 2012-09-06 18:13:52 +08:00 committed by Eric Blake
parent f36fadca10
commit f7e1a546f2

View File

@ -691,13 +691,17 @@ int qemuSetupCgroupForEmulator(struct qemud_driver *driver,
}
if (def->cputune.emulatorpin &&
qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET) &&
qemuSetupCgroupEmulatorPin(cgroup_emulator, def->cputune.emulatorpin) < 0)
goto cleanup;
qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET)) {
rc = qemuSetupCgroupEmulatorPin(cgroup_emulator,
def->cputune.emulatorpin);
if (rc < 0)
goto cleanup;
}
if (period || quota) {
if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
if (qemuSetupCgroupVcpuBW(cgroup_emulator, period, quota) < 0)
if ((rc = qemuSetupCgroupVcpuBW(cgroup_emulator, period,
quota)) < 0)
goto cleanup;
}
}