openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

test driver: Make test capabilities report more hugepages per each NUMA node 

Signed-off-by: Roland Schulz <schullzroll@gmail.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Roland Schulz 2018-05-23 14:40:40 +02:00 committed by Michal Privoznik
parent 0babf84797
commit e58739ad46
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/test_driver.c
View File

@ -322,30 +322,35 @@ testBuildCapabilities(virConnectPtr conn)
if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0)
goto error; goto error;
if (VIR_ALLOC_N(caps->host.pagesSize, 2) < 0) if (VIR_ALLOC_N(caps->host.pagesSize, 4) < 0)
goto error; goto error;
caps->host.pagesSize[caps->host.nPagesSize++] = 4; caps->host.pagesSize[caps->host.nPagesSize++] = 4;
caps->host.pagesSize[caps->host.nPagesSize++] = 8;
caps->host.pagesSize[caps->host.nPagesSize++] = 2048; caps->host.pagesSize[caps->host.nPagesSize++] = 2048;
caps->host.pagesSize[caps->host.nPagesSize++] = 1024 * 1024;
for (i = 0; i < privconn->numCells; i++) { for (i = 0; i < privconn->numCells; i++) {
virCapsHostNUMACellCPUPtr cpu_cells; virCapsHostNUMACellCPUPtr cpu_cells;
virCapsHostNUMACellPageInfoPtr pages; virCapsHostNUMACellPageInfoPtr pages;
size_t nPages; size_t nPages = caps->host.nPagesSize - 1;
if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0 || if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0 ||
VIR_ALLOC_N(pages, caps->host.nPagesSize) < 0) { VIR_ALLOC_N(pages, nPages) < 0) {
VIR_FREE(cpu_cells); VIR_FREE(cpu_cells);
goto error; goto error;
} }
nPages = caps->host.nPagesSize;
memcpy(cpu_cells, privconn->cells[i].cpus, memcpy(cpu_cells, privconn->cells[i].cpus,
sizeof(*cpu_cells) * privconn->cells[i].numCpus); sizeof(*cpu_cells) * privconn->cells[i].numCpus);
for (j = 0; j < nPages; j++) if (i == 1)
pages[j].size = caps->host.pagesSize[j]; pages[0].size = caps->host.pagesSize[1];
else
pages[0].size = caps->host.pagesSize[0];
for (j = 1; j < nPages; j++)
pages[j].size = caps->host.pagesSize[j + 1];
pages[0].avail = privconn->cells[i].mem / pages[0].size; pages[0].avail = privconn->cells[i].mem / pages[0].size;