From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 29 Aug 2012 13:30:34 +0000 (+0200)
Subject: qemu: Fix starting domains with no cpu cgroup
X-Git-Tag: v0.10.1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c7cca36e7d5676ab2daf5f046177a4bac53080e;p=thirdparty%2Flibvirt.git

qemu: Fix starting domains with no cpu cgroup

If cgroups are enabled in general but cpu cgroup is disabled in
qemu.conf or not mounted at all, libvirt would refuse to start any
domain even though scheduler parameters are not set in domain XML.

This patch makes cpu cgroup mandatory only for domains that actually
want to use it.
---

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index be1b96d714..df67ff306e 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -549,7 +549,8 @@ int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm)
     if (driver->cgroup == NULL)
         return 0; /* Not supported, so claim success */
 
-    if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
+    if ((period || quota) &&
+        !qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
         virReportError(VIR_ERR_SYSTEM_ERROR, "%s",
                        _("cgroup cpu is not active"));
         return -1;