Based on qemu changes made in commits ae523427 and 659ded58.
* src/lxc/lxc_driver.c (lxcSetSchedulerParametersFlags)
(lxcGetSchedulerParametersFlags, lxcDomainSetBlkioParameters)
(lxcDomainGetBlkioParameters): Use helpers.
(lxcDomainSetBlkioParameters): Allow setting live and config at
once.
---
src/lxc/lxc_driver.c | 160 +-
1 files changed, 29 insertions(+), 131 deletions(-)
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3baff19..7d6ac59 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2010-2012 Red Hat, Inc.
* Copyright IBM Corp. 2008
*
* lxc_driver.c: linux container driver functions
@@ -2749,7 +2749,6 @@ lxcSetSchedulerParametersFlags(virDomainPtr dom,
virDomainObjPtr vm = NULL;
virDomainDefPtr vmdef = NULL;
int ret = -1;
-bool isActive;
int rc;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@@ -2765,22 +2764,11 @@ lxcSetSchedulerParametersFlags(virDomainPtr dom,
goto cleanup;
}
-isActive = virDomainObjIsActive(vm);
-
-if (flags == VIR_DOMAIN_AFFECT_CURRENT) {
-if (isActive)
-flags = VIR_DOMAIN_AFFECT_LIVE;
-else
-flags = VIR_DOMAIN_AFFECT_CONFIG;
-}
+if (virDomainLiveConfigHelperMethod(driver-caps, vm, flags,
+vmdef) 0)
+goto cleanup;
if (flags VIR_DOMAIN_AFFECT_CONFIG) {
-if (!vm-persistent) {
-lxcError(VIR_ERR_OPERATION_INVALID, %s,
- _(cannot change persistent config of a transient
domain));
-goto cleanup;
-}
-
/* Make a copy for updated domain. */
vmdef = virDomainObjCopyPersistentDef(driver-caps, vm);
if (!vmdef)
@@ -2788,12 +2776,6 @@ lxcSetSchedulerParametersFlags(virDomainPtr dom,
}
if (flags VIR_DOMAIN_AFFECT_LIVE) {
-if (!isActive) {
-lxcError(VIR_ERR_OPERATION_INVALID,
- %s, _(domain is not running));
-goto cleanup;
-}
-
if (!lxcCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
lxcError(VIR_ERR_OPERATION_INVALID,
%s, _(cgroup CPU controller is not mounted));
@@ -2919,12 +2901,12 @@ lxcGetSchedulerParametersFlags(virDomainPtr dom,
lxc_driver_t *driver = dom-conn-privateData;
virCgroupPtr group = NULL;
virDomainObjPtr vm = NULL;
+virDomainDefPtr persistentDef;
unsigned long long shares = 0;
unsigned long long period = 0;
long long quota = 0;
int ret = -1;
int rc;
-bool isActive;
bool cpu_bw_status = false;
int saved_nparams = 0;
@@ -2948,52 +2930,19 @@ lxcGetSchedulerParametersFlags(virDomainPtr dom,
goto cleanup;
}
-isActive = virDomainObjIsActive(vm);
-
-if (flags == VIR_DOMAIN_AFFECT_CURRENT) {
-if (isActive)
-flags = VIR_DOMAIN_AFFECT_LIVE;
-else
-flags = VIR_DOMAIN_AFFECT_CONFIG;
-}
+if (virDomainLiveConfigHelperMethod(driver-caps, vm, flags,
+persistentDef) 0)
+goto cleanup;
if (flags VIR_DOMAIN_AFFECT_CONFIG) {
-if (!vm-persistent) {
-lxcError(VIR_ERR_OPERATION_INVALID, %s,
- _(cannot query persistent config of a transient
domain));
-goto cleanup;
-}
-
-if (isActive) {
-virDomainDefPtr persistentDef;
-
-persistentDef = virDomainObjGetPersistentDef(driver-caps, vm);
-if (!persistentDef) {
-lxcError(VIR_ERR_INTERNAL_ERROR, %s,
- _(can't get persistentDef));
-goto cleanup;
-}
-shares = persistentDef-cputune.shares;
-if (*nparams 1 cpu_bw_status) {
-period = persistentDef-cputune.period;
-quota = persistentDef-cputune.quota;
-}
-} else {
-shares = vm-def-cputune.shares;
-if (*nparams 1 cpu_bw_status) {
-period = vm-def-cputune.period;
-quota = vm-def-cputune.quota;
-}
+shares = persistentDef-cputune.shares;
+if (*nparams 1 cpu_bw_status) {
+period = persistentDef-cputune.period;
+quota = persistentDef-cputune.quota;
}
goto out;
}
-if (!isActive) {
-lxcError(VIR_ERR_OPERATION_INVALID, %s,
- _(domain is not running));
-goto cleanup;
-}
-
if (!lxcCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
lxcError(VIR_ERR_OPERATION_INVALID,
%s, _(cgroup CPU controller is not mounted));
@@ -3091,7 +3040,6 @@ static int lxcDomainSetBlkioParameters(virDomainPtr dom,
virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL;
