2:07 a.m.
This series enables user to change blkio parameters for inactive
domains from virsh command line.
Hu Tao (3):
Add new parameters for blkiotune
update qemuDomainGetBlkioParameters to use flags
Update qemuDomainSetBlkioParameters to use flags
include/libvirt/libvirt.h.in | 6 +
src/qemu/qemu_driver.c | 250 +++++++++++++++++++++++++++++-------------
tools/virsh.c | 26 ++++-
tools/virsh.pod | 6 +-
4 files changed, 210 insertions(+), 78 deletions(-)
--
1.7.3.1
2:07 a.m.
New subject: [libvirt] [PATCH 1/3] Add new parameters for blkiotune
This patch adds three parameters --live, --config and --current
for command blkiotune.
---
include/libvirt/libvirt.h.in | 6 ++++++
tools/virsh.c | 26 +++++++++++++++++++++++---
tools/virsh.pod | 6 +++++-
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 7cd6e13..fe50d41 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -814,6 +814,12 @@ typedef enum {
VIR_DOMAIN_BLKIO_PARAM_BOOLEAN = VIR_TYPED_PARAM_BOOLEAN,
} virBlkioParameterType;
+typedef enum {
+ VIR_DOMAIN_BLKIO_PARAM_CURRENT = 0, /* affect current domain state */
+ VIR_DOMAIN_BLKIO_PARAM_LIVE = (1 << 0), /* affect active domain */
+ VIR_DOMAIN_BLKIO_PARAM_CONFIG = (1 << 1) /* affect next boot */
+} virBlkioParameterFlags;
+
/**
* VIR_DOMAIN_BLKIO_FIELD_LENGTH:
*
diff --git a/tools/virsh.c b/tools/virsh.c
index de49489..2ecb2ea 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -3171,6 +3171,9 @@ static const vshCmdOptDef opts_blkiotune[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or
uuid")},
{"weight", VSH_OT_INT, VSH_OFLAG_NONE,
N_("IO Weight in range [100, 1000]")},
+ {"config", VSH_OT_BOOL, 0, N_("affect next boot")},
+ {"live", VSH_OT_BOOL, 0, N_("affect running domain")},
+ {"current", VSH_OT_BOOL, 0, N_("affect current domain")},
{NULL, 0, 0, NULL}
};
@@ -3183,6 +3186,23 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
unsigned int i = 0;
virBlkioParameterPtr params = NULL, temp = NULL;
bool ret = false;
+ unsigned int flags = 0;
+ int current = vshCommandOptBool(cmd, "current");
+ int config = vshCommandOptBool(cmd, "config");
+ int live = vshCommandOptBool(cmd, "live");
+
+ if (current) {
+ if (live || config) {
+ vshError(ctl, "%s", _("--current must be specified
exclusively"));
+ return false;
+ }
+ flags = VIR_DOMAIN_BLKIO_PARAM_CURRENT;
+ } else {
+ if (config)
+ flags |= VIR_DOMAIN_BLKIO_PARAM_CONFIG;
+ if (live)
+ flags |= VIR_DOMAIN_BLKIO_PARAM_LIVE;
+ }
if (!vshConnectionUsability(ctl, ctl->conn))
return false;
@@ -3207,7 +3227,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
if (nparams == 0) {
/* get the number of blkio parameters */
- if (virDomainGetBlkioParameters(dom, NULL, &nparams, 0) != 0) {
+ if (virDomainGetBlkioParameters(dom, NULL, &nparams, flags) != 0) {
vshError(ctl, "%s",
_("Unable to get number of blkio parameters"));
goto cleanup;
@@ -3221,7 +3241,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
/* now go get all the blkio parameters */
params = vshCalloc(ctl, nparams, sizeof(*params));
- if (virDomainGetBlkioParameters(dom, params, &nparams, 0) != 0) {
+ if (virDomainGetBlkioParameters(dom, params, &nparams, flags) != 0) {
vshError(ctl, "%s", _("Unable to get blkio
parameters"));
goto cleanup;
}
@@ -3273,7 +3293,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
weight = 0;
}
}
- if (virDomainSetBlkioParameters(dom, params, nparams, 0) != 0)
+ if (virDomainSetBlkioParameters(dom, params, nparams, flags) != 0)
vshError(ctl, "%s", _("Unable to change blkio
parameters"));
else
ret = true;
diff --git a/tools/virsh.pod b/tools/virsh.pod
index ef01f41..b366ae7 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -674,11 +674,15 @@ value are kilobytes (i.e. blocks of 1024 bytes).
=back
-=item B<blkiotune> I<domain-id> optional I<--weight> B<weight>
+=item B<blkiotune> I<domain-id> optional I<--weight> B<weight>
I<--live> I<--config> I<--current>
Display or set the blkio parameters. QEMU/KVM supports I<--weight>.
I<--weight> is in range [100, 1000].
+If I<--live> is specified, get/set blkio parameters of a running guest.
+If I<--config> is specified, affect the next boot of a persistent guest.
+If I<--current> is specified, affect the current guest state.
+
=item B<setvcpus> I<domain-id> I<count> optional I<--maximum>
I<--config>
I<--live>
--
1.7.3.1
2:07 a.m.
New subject: [libvirt] [PATCH 2/3] update qemuDomainGetBlkioParameters to use flags
---
src/qemu/qemu_driver.c | 124 +++++++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 38 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 691965d..ddd3d58 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4725,18 +4725,16 @@ static int qemuDomainGetBlkioParameters(virDomainPtr dom,
int i;
virCgroupPtr group = NULL;
virDomainObjPtr vm = NULL;
+ virDomainDefPtr persistentDef = NULL;
unsigned int val;
int ret = -1;
int rc;
+ bool isActive;
- virCheckFlags(0, -1);
+ virCheckFlags(VIR_DOMAIN_BLKIO_PARAM_LIVE |
+ VIR_DOMAIN_BLKIO_PARAM_CONFIG, -1);
qemuDriverLock(driver);
- if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) {
- qemuReportError(VIR_ERR_NO_SUPPORT, _("blkio cgroup isn't
mounted"));
- goto cleanup;
- }
-
vm = virDomainFindByUUID(&driver->domains, dom->uuid);
if (vm == NULL) {
@@ -4745,12 +4743,6 @@ static int qemuDomainGetBlkioParameters(virDomainPtr dom,
goto cleanup;
}
- if (!virDomainObjIsActive(vm)) {
- qemuReportError(VIR_ERR_OPERATION_INVALID,
- "%s", _("domain is not running"));
- goto cleanup;
- }
-
if ((*nparams) == 0) {
/* Current number of blkio parameters supported by cgroups */
*nparams = QEMU_NB_BLKIO_PARAM;
@@ -4764,37 +4756,93 @@ static int qemuDomainGetBlkioParameters(virDomainPtr dom,
goto cleanup;
}
- if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0)
{
- qemuReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot find cgroup for domain %s"),
vm->def->name);
- goto cleanup;
+ isActive = virDomainObjIsActive(vm);
+
+ if (flags == VIR_DOMAIN_BLKIO_PARAM_CURRENT) {
+ if (isActive)
+ flags = VIR_DOMAIN_BLKIO_PARAM_LIVE;
+ else
+ flags = VIR_DOMAIN_BLKIO_PARAM_CONFIG;
}
- for (i = 0; i < *nparams; i++) {
- virBlkioParameterPtr param = ¶ms[i];
- val = 0;
- param->value.ui = 0;
- param->type = VIR_DOMAIN_BLKIO_PARAM_UINT;
+ if (flags & VIR_DOMAIN_BLKIO_PARAM_LIVE) {
+ if (!isActive) {
+ qemuReportError(VIR_ERR_OPERATION_INVALID,
+ "%s", _("domain is not running"));
+ goto cleanup;
+ }
- switch (i) {
- case 0: /* fill blkio weight here */
- rc = virCgroupGetBlkioWeight(group, &val);
- if (rc != 0) {
- virReportSystemError(-rc, "%s",
- _("unable to get blkio weight"));
- goto cleanup;
- }
- if (virStrcpyStatic(param->field, VIR_DOMAIN_BLKIO_WEIGHT) == NULL) {
- qemuReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Field blkio weight too long for
destination"));
- goto cleanup;
+ if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) {
+ qemuReportError(VIR_ERR_NO_SUPPORT, _("blkio cgroup isn't
mounted"));
+ goto cleanup;
+ }
+
+ if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) !=
0) {
+ qemuReportError(VIR_ERR_INTERNAL_ERROR,
+ _("cannot find cgroup for domain %s"),
vm->def->name);
+ goto cleanup;
+ }
+ }
+
+ if (flags & VIR_DOMAIN_BLKIO_PARAM_CONFIG) {
+ if (!vm->persistent) {
+ qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("cannot change persistent config of a transient
domain"));
+ goto cleanup;
+ }
+ if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm)))
+ goto cleanup;
+ }
+
+ if (flags & VIR_DOMAIN_BLKIO_PARAM_LIVE) {
+ for (i = 0; i < *nparams; i++) {
+ virBlkioParameterPtr param = ¶ms[i];
+ val = 0;
+ param->value.ui = 0;
+ param->type = VIR_DOMAIN_BLKIO_PARAM_UINT;
+
+ switch (i) {
+ case 0: /* fill blkio weight here */
+ rc = virCgroupGetBlkioWeight(group, &val);
+ if (rc != 0) {
+ virReportSystemError(-rc, "%s",
+ _("unable to get blkio weight"));
+ goto cleanup;
+ }
+ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLKIO_WEIGHT) == NULL) {
+ qemuReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Field blkio weight too long
for destination"));
+ goto cleanup;
+ }
+ param->value.ui = val;
+ break;
+
+ default:
+ break;
+ /* should not hit here */
}
- param->value.ui = val;
- break;
+ }
+ } else if (flags & VIR_DOMAIN_BLKIO_PARAM_CONFIG) {
+ for (i = 0; i < *nparams; i++) {
+ virBlkioParameterPtr param = ¶ms[i];
+ val = 0;
+ param->value.ui = 0;
+ param->type = VIR_DOMAIN_BLKIO_PARAM_UINT;
+
+ switch (i) {
+ case 0: /* fill blkio weight here */
+ if (virStrcpyStatic(param->field, VIR_DOMAIN_BLKIO_WEIGHT) == NULL) {
+ qemuReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Field blkio weight too long
for destination"));
+ goto cleanup;
+ }
+ param->value.ui = persistentDef->blkio.weight;
+ break;
- default:
- break;
- /* should not hit here */
+ default:
+ break;
+ /* should not hit here */
+ }
}
}
--
1.7.3.1
2:07 a.m.
New subject: [libvirt] [PATCH 3/3] Update qemuDomainSetBlkioParameters to use flags
---
src/qemu/qemu_driver.c | 126 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 36 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ddd3d58..381ecca 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4646,14 +4646,13 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom,
int i;
virCgroupPtr group = NULL;
virDomainObjPtr vm = NULL;
+ virDomainDefPtr persistentDef = NULL;
int ret = -1;
+ bool isActive;
- virCheckFlags(0, -1);
+ virCheckFlags(VIR_DOMAIN_BLKIO_PARAM_LIVE |
+ VIR_DOMAIN_BLKIO_PARAM_CONFIG, -1);
qemuDriverLock(driver);
- if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) {
- qemuReportError(VIR_ERR_NO_SUPPORT, _("blkio cgroup isn't
mounted"));
- goto cleanup;
- }
vm = virDomainFindByUUID(&driver->domains, dom->uuid);
@@ -4663,49 +4662,104 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom,
goto cleanup;
}
- if (!virDomainObjIsActive(vm)) {
- qemuReportError(VIR_ERR_OPERATION_INVALID,
- "%s", _("domain is not running"));
- goto cleanup;
+ isActive = virDomainObjIsActive(vm);
+
+ if (flags == VIR_DOMAIN_BLKIO_PARAM_CURRENT) {
+ if (isActive)
+ flags = VIR_DOMAIN_BLKIO_PARAM_LIVE;
+ else
+ flags = VIR_DOMAIN_BLKIO_PARAM_CONFIG;
}
- if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0)
{
- qemuReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot find cgroup for domain %s"),
vm->def->name);
- goto cleanup;
+ if (flags & VIR_DOMAIN_BLKIO_PARAM_LIVE) {
+ if (!isActive) {
+ qemuReportError(VIR_ERR_OPERATION_INVALID,
+ "%s", _("domain is not running"));
+ goto cleanup;
+ }
+
+ if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) {
+ qemuReportError(VIR_ERR_NO_SUPPORT, _("blkio cgroup isn't
mounted"));
+ goto cleanup;
+ }
+
+ if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) !=
0) {
+ qemuReportError(VIR_ERR_INTERNAL_ERROR,
+ _("cannot find cgroup for domain %s"),
vm->def->name);
+ goto cleanup;
+ }
+ }
+
+ if (flags & VIR_DOMAIN_BLKIO_PARAM_CONFIG) {
+ if (!vm->persistent) {
+ qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("cannot change persistent config of a transient
domain"));
+ goto cleanup;
+ }
+ if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm)))
+ goto cleanup;
}
ret = 0;
- for (i = 0; i < nparams; i++) {
- virBlkioParameterPtr param = ¶ms[i];
+ if (flags & VIR_DOMAIN_BLKIO_PARAM_LIVE) {
+ for (i = 0; i < nparams; i++) {
+ virBlkioParameterPtr param = ¶ms[i];
- if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) {
- int rc;
- if (param->type != VIR_DOMAIN_BLKIO_PARAM_UINT) {
- qemuReportError(VIR_ERR_INVALID_ARG, "%s",
- _("invalid type for blkio weight tunable, expected a
'unsigned int'"));
- ret = -1;
- continue;
- }
+ if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) {
+ int rc;
+ if (param->type != VIR_DOMAIN_BLKIO_PARAM_UINT) {
+ qemuReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("invalid type for blkio weight tunable,
expected a 'unsigned int'"));
+ ret = -1;
+ continue;
+ }
- if (params[i].value.ui > 1000 || params[i].value.ui < 100) {
- qemuReportError(VIR_ERR_INVALID_ARG, "%s",
- _("out of blkio weight range."));
+ if (params[i].value.ui > 1000 || params[i].value.ui < 100) {
+ qemuReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("out of blkio weight range."));
+ ret = -1;
+ continue;
+ }
+
+ rc = virCgroupSetBlkioWeight(group, params[i].value.ui);
+ if (rc != 0) {
+ virReportSystemError(-rc, "%s",
+ _("unable to set blkio weight
tunable"));
+ ret = -1;
+ }
+ } else {
+ qemuReportError(VIR_ERR_INVALID_ARG,
+ _("Parameter `%s' not supported"),
param->field);
ret = -1;
- continue;
}
+ }
+ } else if (flags & VIR_DOMAIN_BLKIO_PARAM_CONFIG) {
+ for (i = 0; i < nparams; i++) {
+ virBlkioParameterPtr param = ¶ms[i];
- rc = virCgroupSetBlkioWeight(group, params[i].value.ui);
- if (rc != 0) {
- virReportSystemError(-rc, "%s",
- _("unable to set blkio weight tunable"));
+ if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) {
+ if (param->type != VIR_DOMAIN_BLKIO_PARAM_UINT) {
+ qemuReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("invalid type for blkio weight tunable,
expected a 'unsigned int'"));
+ ret = -1;
+ continue;
+ }
+
+ if (params[i].value.ui > 1000 || params[i].value.ui < 100) {
+ qemuReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("out of blkio weight range."));
+ ret = -1;
+ continue;
+ }
+
+ persistentDef->blkio.weight = params[i].value.ui;
+ } else {
+ qemuReportError(VIR_ERR_INVALID_ARG,
+ _("Parameter `%s' not supported"),
param->field);
ret = -1;
}
- } else {
- qemuReportError(VIR_ERR_INVALID_ARG,
- _("Parameter `%s' not supported"),
param->field);
- ret = -1;
}
+ ret = virDomainSaveConfig(driver->configDir, persistentDef);
}
cleanup:
--
1.7.3.1
4980
days inactive
4980
days old
3 comments
1 participants
participants (1)
-
Hu Tao