]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Report a more informative error for missing cgroup controllers
authorMatthias Bolte <matthias.bolte@googlemail.com>
Fri, 11 Feb 2011 10:02:39 +0000 (11:02 +0100)
committerMatthias Bolte <matthias.bolte@googlemail.com>
Sat, 12 Feb 2011 12:37:57 +0000 (13:37 +0100)
Also use VIR_ERR_OPERATION_INVALID instead of VIR_ERR_NO_SUPPORT, as
the operation could succeed when the cgroup controller was mounted.

src/qemu/qemu_driver.c

index 21d777961bafcc6619dea53f38b7683a263d993a..fa462f99e36837736e6755ebcbaccaf66b471d20 100644 (file)
@@ -3962,7 +3962,7 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
 
     /* Lack of balloon support is a fatal error */
     if (r == 0) {
-        qemuReportError(VIR_ERR_NO_SUPPORT,
+        qemuReportError(VIR_ERR_OPERATION_INVALID,
                         "%s", _("cannot set memory of an active domain"));
         goto endjob;
     }
@@ -6980,8 +6980,8 @@ static char *qemuGetSchedulerType(virDomainPtr dom,
 
     qemuDriverLock(driver);
     if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
-        qemuReportError(VIR_ERR_NO_SUPPORT,
-                        __FUNCTION__);
+        qemuReportError(VIR_ERR_OPERATION_INVALID,
+                        "%s", _("cgroup CPU controller is not mounted"));
         goto cleanup;
     }
 
@@ -7011,8 +7011,8 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
 
     qemuDriverLock(driver);
     if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) {
-        qemuReportError(VIR_ERR_NO_SUPPORT,
-                        __FUNCTION__);
+        qemuReportError(VIR_ERR_OPERATION_INVALID,
+                        "%s", _("cgroup memory controller is not mounted"));
         goto cleanup;
     }
 
@@ -7114,8 +7114,8 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom,
     qemuDriverLock(driver);
 
     if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) {
-        qemuReportError(VIR_ERR_NO_SUPPORT,
-                        __FUNCTION__);
+        qemuReportError(VIR_ERR_OPERATION_INVALID,
+                        "%s", _("cgroup memory controller is not mounted"));
         goto cleanup;
     }
 
@@ -7227,8 +7227,8 @@ static int qemuSetSchedulerParameters(virDomainPtr dom,
 
     qemuDriverLock(driver);
     if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
-        qemuReportError(VIR_ERR_NO_SUPPORT,
-                        __FUNCTION__);
+        qemuReportError(VIR_ERR_OPERATION_INVALID,
+                        "%s", _("cgroup CPU controller is not mounted"));
         goto cleanup;
     }
 
@@ -7292,8 +7292,8 @@ static int qemuGetSchedulerParameters(virDomainPtr dom,
 
     qemuDriverLock(driver);
     if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
-        qemuReportError(VIR_ERR_NO_SUPPORT,
-                        __FUNCTION__);
+        qemuReportError(VIR_ERR_OPERATION_INVALID,
+                        "%s", _("cgroup CPU controller is not mounted"));
         goto cleanup;
     }