External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Use virTypedParams* APIs in schedinfo

Browse Source
This commit is contained in:
Jiri Denemark 2013-01-16 00:06:20 +01:00
parent 9b2d2446af
commit e982dacb45
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/virsh-domain.c
View File

@ -3985,11 +3985,10 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
const char *set_arg; const char *set_arg;
char *set_field = NULL; char *set_field = NULL;
char *set_val = NULL; char *set_val = NULL;
virTypedParameterPtr param; virTypedParameterPtr param;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = 0; int nparams = 0;
size_t params_size = 0; int maxparams = 0;
int ret = -1; int ret = -1;
int rv; int rv;
int val; int val;
@ -4008,10 +4007,6 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
for (i = 0; i < nsrc_params; i++) { for (i = 0; i < nsrc_params; i++) {
param = &(src_params[i]); param = &(src_params[i]);
if (VIR_RESIZE_N(params, params_size, nparams, 1) < 0) {
virReportOOMError();
goto cleanup;
}
/* Legacy 'weight' and 'cap' parameter */ /* Legacy 'weight' and 'cap' parameter */
if (param->type == VIR_TYPED_PARAM_UINT && if (param->type == VIR_TYPED_PARAM_UINT &&
@ -4022,10 +4017,8 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
goto cleanup; goto cleanup;
} }
if (virTypedParameterAssign(&(params[nparams++]), if (virTypedParamsAddUInt(&params, &nparams, &maxparams,
param->field, param->field, val) < 0) {
param->type,
val) < 0) {
vshSaveLibvirtError(); vshSaveLibvirtError();
goto cleanup; goto cleanup;
} }
@ -4033,12 +4026,10 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
continue; continue;
} }
if (set_field && STREQ(set_field, param->field)) { if (set_field && STREQ(set_field, param->field)) {
if (virTypedParameterAssignFromStr(&(params[nparams++]), if (virTypedParamsAddFromString(&params, &nparams, &maxparams,
param->field, set_field, param->type,
param->type, set_val) < 0) {
set_val) < 0) {
vshSaveLibvirtError(); vshSaveLibvirtError();
goto cleanup; goto cleanup;
} }
@ -4053,8 +4044,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
cleanup: cleanup:
VIR_FREE(set_field); VIR_FREE(set_field);
virTypedParameterArrayClear(params, nparams); virTypedParamsFree(params, nparams);
VIR_FREE(params);
return ret; return ret;
} }
@ -4170,10 +4160,8 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
} }
cleanup: cleanup:
virTypedParameterArrayClear(params, nparams); virTypedParamsFree(params, nparams);
virTypedParameterArrayClear(updates, nupdates); virTypedParamsFree(updates, nupdates);
VIR_FREE(params);
VIR_FREE(updates);
virDomainFree(dom); virDomainFree(dom);
return ret_val; return ret_val;
} }