shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 05:17:59 +03:00
Code Releases Activity

virsh-host: Refactor cmdFreecell

Browse Source 
Use the new helpers to determine mutually exclusive options and touch up
some parts to simplify the code.
This commit is contained in:
Peter Krempa 2013-03-07 10:36:08 +01:00
parent 55b3b15cd0
commit ccb692102a
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tools/virsh-host.c
View File

@ -156,35 +156,29 @@ static const vshCmdOptDef opts_freecell[] = {
static bool static bool
cmdFreecell(vshControl *ctl, const vshCmd *cmd) cmdFreecell(vshControl *ctl, const vshCmd *cmd)
{ {
bool func_ret = false; bool ret = false;
int ret; int cell = -1;
int cell = -1, cell_given; unsigned long long memory = 0;
unsigned long long memory;
xmlNodePtr *nodes = NULL; xmlNodePtr *nodes = NULL;
unsigned long nodes_cnt; unsigned long nodes_cnt;
unsigned long *nodes_id = NULL; unsigned long *nodes_id = NULL;
unsigned long long *nodes_free = NULL; unsigned long long *nodes_free = NULL;
int all_given; bool all = vshCommandOptBool(cmd, "all");
bool cellno = vshCommandOptBool(cmd, "cellno");
int i; int i;
char *cap_xml = NULL; char *cap_xml = NULL;
xmlDocPtr xml = NULL; xmlDocPtr xml = NULL;
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
if ((cell_given = vshCommandOptInt(cmd, "cellno", &cell)) < 0) { VSH_EXCLUSIVE_OPTIONS_VAR(all, cellno);
if (cellno && vshCommandOptInt(cmd, "cellno", &cell) < 0) {
vshError(ctl, "%s", _("cell number has to be a number")); vshError(ctl, "%s", _("cell number has to be a number"));
goto cleanup; return false;
}
all_given = vshCommandOptBool(cmd, "all");
if (all_given && cell_given) {
vshError(ctl, "%s", _("--cellno and --all are mutually exclusive. "
"Please choose only one."));
goto cleanup;
} }
if (all_given) { if (all) {
cap_xml = virConnectGetCapabilities(ctl->conn); if (!(cap_xml = virConnectGetCapabilities(ctl->conn))) {
if (!cap_xml) {
vshError(ctl, "%s", _("unable to get node capabilities")); vshError(ctl, "%s", _("unable to get node capabilities"));
goto cleanup; goto cleanup;
} }
@ -194,6 +188,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd)
vshError(ctl, "%s", _("unable to get node capabilities")); vshError(ctl, "%s", _("unable to get node capabilities"));
goto cleanup; goto cleanup;
} }
nodes_cnt = virXPathNodeSet("/capabilities/host/topology/cells/cell", nodes_cnt = virXPathNodeSet("/capabilities/host/topology/cells/cell",
ctxt, &nodes); ctxt, &nodes);
@ -216,15 +211,14 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd)
} }
VIR_FREE(val); VIR_FREE(val);
nodes_id[i]=id; nodes_id[i]=id;
ret = virNodeGetCellsFreeMemory(ctl->conn, &(nodes_free[i]), id, 1); if (virNodeGetCellsFreeMemory(ctl->conn, &(nodes_free[i]),
if (ret != 1) { id, 1) != 1) {
vshError(ctl, _("failed to get free memory for NUMA node " vshError(ctl, _("failed to get free memory for NUMA node "
"number: %lu"), id); "number: %lu"), id);
goto cleanup; goto cleanup;
} }
} }
memory = 0;
for (cell = 0; cell < nodes_cnt; cell++) { for (cell = 0; cell < nodes_cnt; cell++) {
vshPrint(ctl, "%5lu: %10llu KiB\n", nodes_id[cell], vshPrint(ctl, "%5lu: %10llu KiB\n", nodes_id[cell],
(nodes_free[cell]/1024)); (nodes_free[cell]/1024));
@ -234,23 +228,20 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd)
vshPrintExtra(ctl, "--------------------\n"); vshPrintExtra(ctl, "--------------------\n");
vshPrintExtra(ctl, "%5s: %10llu KiB\n", _("Total"), memory/1024); vshPrintExtra(ctl, "%5s: %10llu KiB\n", _("Total"), memory/1024);
} else { } else {
if (!cell_given) { if (cellno) {
memory = virNodeGetFreeMemory(ctl->conn); if (virNodeGetCellsFreeMemory(ctl->conn, &memory, cell, 1) != 1)
if (memory == 0)
goto cleanup; goto cleanup;
} else {
ret = virNodeGetCellsFreeMemory(ctl->conn, &memory, cell, 1);
if (ret != 1)
goto cleanup;
}
if (cell == -1)
vshPrint(ctl, "%s: %llu KiB\n", _("Total"), (memory/1024));
else
vshPrint(ctl, "%d: %llu KiB\n", cell, (memory/1024)); vshPrint(ctl, "%d: %llu KiB\n", cell, (memory/1024));
} else {
if ((memory = virNodeGetFreeMemory(ctl->conn)) == 0)
goto cleanup;
vshPrint(ctl, "%s: %llu KiB\n", _("Total"), (memory/1024));
}
} }
func_ret = true; ret = true;
cleanup: cleanup:
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
@ -259,7 +250,7 @@ cleanup:
VIR_FREE(nodes_free); VIR_FREE(nodes_free);
VIR_FREE(nodes_id); VIR_FREE(nodes_id);
VIR_FREE(cap_xml); VIR_FREE(cap_xml);
return func_ret; return ret;
} }
/* /*