shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

virsh-host: fix pagesize unit of freepages

Browse Source 
The unit of '--pagesize' of freepages is kibibytes.

https://bugzilla.redhat.com/show_bug.cgi?id=1145048

Signed-off-by: Jincheng Miao <jmiao@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jincheng Miao 2014-09-22 18:14:26 +08:00 committed by Michal Privoznik
parent 9cc1586d2b
commit c3e2d5929c
1 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tools/virsh-host.c
View File

@ -293,7 +293,8 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
bool ret = false; bool ret = false;
unsigned int npages; unsigned int npages;
unsigned int *pagesize = NULL; unsigned int *pagesize = NULL;
unsigned long long tmp = 0; unsigned long long bytes = 0;
unsigned int kibibytes = 0;
int cell; int cell;
unsigned long long *counts = NULL; unsigned long long *counts = NULL;
size_t i, j; size_t i, j;
@ -304,9 +305,16 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
bool all = vshCommandOptBool(cmd, "all"); bool all = vshCommandOptBool(cmd, "all");
bool cellno = vshCommandOptBool(cmd, "cellno"); bool cellno = vshCommandOptBool(cmd, "cellno");
bool pagesz = vshCommandOptBool(cmd, "pagesize");
VSH_EXCLUSIVE_OPTIONS_VAR(all, cellno); VSH_EXCLUSIVE_OPTIONS_VAR(all, cellno);
if (vshCommandOptScaledInt(cmd, "pagesize", &bytes, 1024, UINT_MAX) < 0) {
vshError(ctl, "%s", _("page size has to be a number"));
goto cleanup;
}
kibibytes = VIR_DIV_UP(bytes, 1024);
if (all) { if (all) {
if (!(cap_xml = virConnectGetCapabilities(ctl->conn))) { if (!(cap_xml = virConnectGetCapabilities(ctl->conn))) {
vshError(ctl, "%s", _("unable to get node capabilities")); vshError(ctl, "%s", _("unable to get node capabilities"));
@ -318,30 +326,36 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
nodes_cnt = virXPathNodeSet("/capabilities/host/cpu/pages", ctxt, &nodes); if (!pagesz) {
nodes_cnt = virXPathNodeSet("/capabilities/host/cpu/pages", ctxt, &nodes);
if (nodes_cnt <= 0) { if (nodes_cnt <= 0) {
vshError(ctl, "%s", _("could not get information about " vshError(ctl, "%s", _("could not get information about "
"supported page sizes")); "supported page sizes"));
goto cleanup;
}
pagesize = vshCalloc(ctl, nodes_cnt, sizeof(*pagesize));
for (i = 0; i < nodes_cnt; i++) {
char *val = virXMLPropString(nodes[i], "size");
if (virStrToLong_ui(val, NULL, 10, &pagesize[i]) < 0) {
vshError(ctl, _("unable to parse page size: %s"), val);
VIR_FREE(val);
goto cleanup; goto cleanup;
} }
VIR_FREE(val); pagesize = vshCalloc(ctl, nodes_cnt, sizeof(*pagesize));
}
npages = nodes_cnt; for (i = 0; i < nodes_cnt; i++) {
VIR_FREE(nodes); char *val = virXMLPropString(nodes[i], "size");
if (virStrToLong_ui(val, NULL, 10, &pagesize[i]) < 0) {
vshError(ctl, _("unable to parse page size: %s"), val);
VIR_FREE(val);
goto cleanup;
}
VIR_FREE(val);
}
npages = nodes_cnt;
VIR_FREE(nodes);
} else {
pagesize = vshMalloc(ctl, sizeof(*pagesize));
pagesize[0] = kibibytes;
npages = 1;
}
counts = vshCalloc(ctl, npages, sizeof(*counts)); counts = vshCalloc(ctl, npages, sizeof(*counts));
@ -380,22 +394,19 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
} }
if (cell < -1) { if (cell < -1) {
vshError(ctl, "%s", _("cell number must be non-negative integer or -1")); vshError(ctl, "%s",
_("cell number must be non-negative integer or -1"));
goto cleanup; goto cleanup;
} }
if (vshCommandOptScaledInt(cmd, "pagesize", &tmp, 1, UINT_MAX) < 0) { if (!pagesz) {
vshError(ctl, "%s", _("page size has to be a number")); vshError(ctl, "%s", _("missing pagesize argument"));
goto cleanup; goto cleanup;
} }
/* page size is expected in kibibytes */ /* page size is expected in kibibytes */
pagesize = vshMalloc(ctl, sizeof(*pagesize)); pagesize = vshMalloc(ctl, sizeof(*pagesize));
*pagesize = tmp / 1024; pagesize[0] = kibibytes;
if (!pagesize[0]) {
vshError(ctl, "%s", _("page size must be at least 1KiB"));
goto cleanup;
}
counts = vshMalloc(ctl, sizeof(*counts)); counts = vshMalloc(ctl, sizeof(*counts));