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

virsh-domain: Refactor error paths for cmdCPUStats

Browse Source 
This patch fixes the following issues in the cpu-stats virsh command:

1) Renames label failed_params to no_memory to match coding style
2) Uses proper typed parameter cleanup in error paths to avoid leaks
3) Adds a ret variable and simplifies error labels
4) Changes error message to a slightly more descriptive one and gets rid
   of the newline at the end:

Before:
$ virsh cpu-stats tr
error: Failed to virDomainGetCPUStats()

error: Requested operation is not valid: domain is not running

After:
$ tools/virsh cpu-stats tr
error: Failed to retrieve CPU statistics for domain 'tr'
error: Requested operation is not valid: domain is not running
This commit is contained in:
Peter Krempa 2013-01-22 12:17:18 +01:00
parent 35c30522a5
commit a54f25a946
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/virsh-domain.c
View File

@ -6109,9 +6109,10 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainPtr dom; virDomainPtr dom;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i, j, pos, max_id, cpu = -1, show_count = -1, nparams; int i, j, pos, max_id, cpu = -1, show_count = -1, nparams = 0;
bool show_total = false, show_per_cpu = false; bool show_total = false, show_per_cpu = false;
unsigned int flags = 0; unsigned int flags = 0;
bool ret = false;
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
@ -6151,7 +6152,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd)
} }
if (VIR_ALLOC_N(params, nparams * MIN(show_count, 128)) < 0) if (VIR_ALLOC_N(params, nparams * MIN(show_count, 128)) < 0)
goto failed_params; goto no_memory;
while (show_count) { while (show_count) {
int ncpus = MIN(show_count, 128); int ncpus = MIN(show_count, 128);
@ -6199,8 +6200,8 @@ do_show_total:
goto cleanup; goto cleanup;
} }
if (VIR_ALLOC_N(params, nparams)) if (VIR_ALLOC_N(params, nparams) < 0)
goto failed_params; goto no_memory;
/* passing start_cpu == -1 gives us domain's total status */ /* passing start_cpu == -1 gives us domain's total status */
if ((nparams = virDomainGetCPUStats(dom, params, nparams, -1, 1, flags)) < 0) if ((nparams = virDomainGetCPUStats(dom, params, nparams, -1, 1, flags)) < 0)
@ -6222,22 +6223,22 @@ do_show_total:
VIR_FREE(s); VIR_FREE(s);
} }
} }
virTypedParamsFree(params, nparams);
ret = true;
cleanup: cleanup:
virTypedParamsFree(params, nparams);
virDomainFree(dom); virDomainFree(dom);
return true; return ret;
failed_params: no_memory:
virReportOOMError(); virReportOOMError();
virDomainFree(dom); goto cleanup;
return false;
failed_stats: failed_stats:
vshError(ctl, _("Failed to virDomainGetCPUStats()\n")); vshError(ctl, _("Failed to retrieve CPU statistics for domain '%s'"),
VIR_FREE(params); virDomainGetName(dom));
virDomainFree(dom); goto cleanup;
return false;
} }
/* /*