External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 16:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Use virTypedParams* APIs in blkiotune

Browse Source
This commit is contained in:
Jiri Denemark 2013-01-16 00:03:07 +01:00
parent a8fca0da06
commit 39e5173a3d
1 changed files with 23 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tools/virsh-domain.c
View File

@ -1228,9 +1228,10 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
const char *device_weight = NULL; const char *device_weight = NULL;
int weight = 0; int weight = 0;
int nparams = 0; int nparams = 0;
int maxparams = 0;
int rv = 0; int rv = 0;
unsigned int i = 0; unsigned int i = 0;
virTypedParameterPtr params = NULL, temp = NULL; virTypedParameterPtr params = NULL;
bool ret = false; bool ret = false;
unsigned int flags = 0; unsigned int flags = 0;
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
@ -1254,27 +1255,27 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
return false; return false;
if ((rv = vshCommandOptInt(cmd, "weight", &weight)) < 0) { if ((rv = vshCommandOptInt(cmd, "weight", &weight)) < 0) {
vshError(ctl, "%s", vshError(ctl, "%s", _("Unable to parse integer parameter"));
_("Unable to parse integer parameter"));
goto cleanup; goto cleanup;
} } else if (rv > 0) {
if (rv > 0) {
nparams++;
if (weight <= 0) { if (weight <= 0) {
vshError(ctl, _("Invalid value of %d for I/O weight"), weight); vshError(ctl, _("Invalid value of %d for I/O weight"), weight);
goto cleanup; goto cleanup;
} }
if (virTypedParamsAddUInt(&params, &nparams, &maxparams,
VIR_DOMAIN_BLKIO_WEIGHT, weight) < 0)
goto save_error;
} }
rv = vshCommandOptString(cmd, "device-weights", &device_weight); rv = vshCommandOptString(cmd, "device-weights", &device_weight);
if (rv < 0) { if (rv < 0) {
vshError(ctl, "%s", vshError(ctl, "%s", _("Unable to parse string parameter"));
_("Unable to parse string parameter"));
goto cleanup; goto cleanup;
} } else if (rv > 0) {
if (rv > 0) { if (virTypedParamsAddString(&params, &nparams, &maxparams,
nparams++; VIR_DOMAIN_BLKIO_DEVICE_WEIGHT,
device_weight) < 0)
goto save_error;
} }
if (nparams == 0) { if (nparams == 0) {
@ -1305,41 +1306,22 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
} }
} else { } else {
/* set the blkio parameters */ /* set the blkio parameters */
params = vshCalloc(ctl, nparams, sizeof(*params)); if (virDomainSetBlkioParameters(dom, params, nparams, flags) < 0)
goto error;
for (i = 0; i < nparams; i++) {
temp = &params[i];
temp->type = VIR_TYPED_PARAM_UINT;
if (weight) {
temp->value.ui = weight;
if (!virStrcpy(temp->field, VIR_DOMAIN_BLKIO_WEIGHT,
sizeof(temp->field)))
goto cleanup;
weight = 0;
} else if (device_weight) {
temp->value.s = vshStrdup(ctl, device_weight);
temp->type = VIR_TYPED_PARAM_STRING;
if (!virStrcpy(temp->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT,
sizeof(temp->field)))
goto cleanup;
device_weight = NULL;
}
}
if (virDomainSetBlkioParameters(dom, params, nparams, flags) < 0) {
vshError(ctl, "%s", _("Unable to change blkio parameters"));
goto cleanup;
}
} }
ret = true; ret = true;
cleanup: cleanup:
virTypedParameterArrayClear(params, nparams); virTypedParamsFree(params, nparams);
VIR_FREE(params);
virDomainFree(dom); virDomainFree(dom);
return ret; return ret;
save_error:
vshSaveLibvirtError();
error:
vshError(ctl, "%s", _("Unable to change blkio parameters"));
goto cleanup;
} }
typedef enum { typedef enum {