qemu: Report a more informative error for missing cgroup controllers

Also use VIR_ERR_OPERATION_INVALID instead of VIR_ERR_NO_SUPPORT, as
the operation could succeed when the cgroup controller was mounted.
This commit is contained in:
Matthias Bolte 2011-02-11 11:02:39 +01:00
parent 0e629db3bf
commit 1682bcf7d8

View File

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