Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 dcfe37e6 编写于 作者: D Daniel P. Berrange
浏览文件
操作

nodeinfo: rename all memory APIs to have a virHostMem prefix 

In preparation for moving all the memory related APIs out of
the nodeinfo file, give them a virHostMem name prefix.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 bfb412a3
隐藏空白更改
内联 并排
Showing with 108 addition and 107 deletion
src/bhyve/bhyve_driver.c
浏览文件 @ dcfe37e6
...@@ -1175,7 +1175,7 @@ bhyveNodeGetMemoryStats(virConnectPtr conn, ...@@ -1175,7 +1175,7 @@ bhyveNodeGetMemoryStats(virConnectPtr conn,
if (virNodeGetMemoryStatsEnsureACL(conn) < 0) if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryStats(cellNum, params, nparams, flags); return virHostMemGetStats(cellNum, params, nparams, flags);
} }
static int static int
...@@ -1346,7 +1346,7 @@ bhyveNodeGetFreeMemory(virConnectPtr conn) ...@@ -1346,7 +1346,7 @@ bhyveNodeGetFreeMemory(virConnectPtr conn)
if (virNodeGetFreeMemoryEnsureACL(conn) < 0) if (virNodeGetFreeMemoryEnsureACL(conn) < 0)
return 0; return 0;
if (nodeGetMemory(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
return 0; return 0;
return freeMem; return freeMem;
...@@ -1373,7 +1373,7 @@ bhyveNodeGetMemoryParameters(virConnectPtr conn, ...@@ -1373,7 +1373,7 @@ bhyveNodeGetMemoryParameters(virConnectPtr conn,
if (virNodeGetMemoryParametersEnsureACL(conn) < 0) if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryParameters(params, nparams, flags); return virHostMemGetParameters(params, nparams, flags);
} }
static int static int
...@@ -1385,7 +1385,7 @@ bhyveNodeSetMemoryParameters(virConnectPtr conn, ...@@ -1385,7 +1385,7 @@ bhyveNodeSetMemoryParameters(virConnectPtr conn,
if (virNodeSetMemoryParametersEnsureACL(conn) < 0) if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeSetMemoryParameters(params, nparams, flags); return virHostMemSetParameters(params, nparams, flags);
} }
static char * static char *
......
src/libvirt_private.syms
浏览文件 @ dcfe37e6
...@@ -1059,21 +1059,21 @@ virLogManagerNew; ...@@ -1059,21 +1059,21 @@ virLogManagerNew;
# nodeinfo.h # nodeinfo.h
nodeAllocPages;
nodeCapsInitNUMA; nodeCapsInitNUMA;
nodeGetCellsFreeMemory;
nodeGetCPUCount; nodeGetCPUCount;
nodeGetCPUMap; nodeGetCPUMap;
nodeGetCPUStats; nodeGetCPUStats;
nodeGetFreePages;
nodeGetInfo; nodeGetInfo;
nodeGetMemory;
nodeGetMemoryParameters;
nodeGetMemoryStats;
nodeGetOnlineCPUBitmap; nodeGetOnlineCPUBitmap;
nodeGetPresentCPUBitmap; nodeGetPresentCPUBitmap;
nodeGetThreadsPerSubcore; nodeGetThreadsPerSubcore;
nodeSetMemoryParameters; virHostMemAllocPages;
virHostMemGetCellsFree;
virHostMemGetFreePages;
virHostMemGetInfo;
virHostMemGetParameters;
virHostMemGetStats;
virHostMemSetParameters;
# secret/secret_util.h # secret/secret_util.h
......
src/lxc/lxc_driver.c
浏览文件 @ dcfe37e6
...@@ -5246,7 +5246,7 @@ lxcNodeGetMemoryStats(virConnectPtr conn, ...@@ -5246,7 +5246,7 @@ lxcNodeGetMemoryStats(virConnectPtr conn,
if (virNodeGetMemoryStatsEnsureACL(conn) < 0) if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryStats(cellNum, params, nparams, flags); return virHostMemGetStats(cellNum, params, nparams, flags);
} }
...@@ -5259,7 +5259,7 @@ lxcNodeGetCellsFreeMemory(virConnectPtr conn, ...@@ -5259,7 +5259,7 @@ lxcNodeGetCellsFreeMemory(virConnectPtr conn,
if (virNodeGetCellsFreeMemoryEnsureACL(conn) < 0) if (virNodeGetCellsFreeMemoryEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetCellsFreeMemory(freeMems, startCell, maxCells); return virHostMemGetCellsFree(freeMems, startCell, maxCells);
} }
...@@ -5271,7 +5271,7 @@ lxcNodeGetFreeMemory(virConnectPtr conn) ...@@ -5271,7 +5271,7 @@ lxcNodeGetFreeMemory(virConnectPtr conn)
if (virNodeGetFreeMemoryEnsureACL(conn) < 0) if (virNodeGetFreeMemoryEnsureACL(conn) < 0)
return 0; return 0;
if (nodeGetMemory(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
return 0; return 0;
return freeMem; return freeMem;
...@@ -5287,7 +5287,7 @@ lxcNodeGetMemoryParameters(virConnectPtr conn, ...@@ -5287,7 +5287,7 @@ lxcNodeGetMemoryParameters(virConnectPtr conn,
if (virNodeGetMemoryParametersEnsureACL(conn) < 0) if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryParameters(params, nparams, flags); return virHostMemGetParameters(params, nparams, flags);
} }
...@@ -5300,7 +5300,7 @@ lxcNodeSetMemoryParameters(virConnectPtr conn, ...@@ -5300,7 +5300,7 @@ lxcNodeSetMemoryParameters(virConnectPtr conn,
if (virNodeSetMemoryParametersEnsureACL(conn) < 0) if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeSetMemoryParameters(params, nparams, flags); return virHostMemSetParameters(params, nparams, flags);
} }
...@@ -5464,7 +5464,7 @@ lxcNodeGetFreePages(virConnectPtr conn, ...@@ -5464,7 +5464,7 @@ lxcNodeGetFreePages(virConnectPtr conn,
if (virNodeGetFreePagesEnsureACL(conn) < 0) if (virNodeGetFreePagesEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetFreePages(npages, pages, startCell, cellCount, counts); return virHostMemGetFreePages(npages, pages, startCell, cellCount, counts);
} }
...@@ -5484,8 +5484,8 @@ lxcNodeAllocPages(virConnectPtr conn, ...@@ -5484,8 +5484,8 @@ lxcNodeAllocPages(virConnectPtr conn,
if (virNodeAllocPagesEnsureACL(conn) < 0) if (virNodeAllocPagesEnsureACL(conn) < 0)
return -1; return -1;
return nodeAllocPages(npages, pageSizes, pageCounts, return virHostMemAllocPages(npages, pageSizes, pageCounts,
startCell, cellCount, add); startCell, cellCount, add);
} }
......
src/nodeinfo.c
浏览文件 @ dcfe37e6
...@@ -187,7 +187,7 @@ freebsdNodeGetCPUStats(int cpuNum, ...@@ -187,7 +187,7 @@ freebsdNodeGetCPUStats(int cpuNum,
} }
static int static int
freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params, virHostMemGetStatsFreeBSD(virNodeMemoryStatsPtr params,
int *nparams) int *nparams)
{ {
size_t i, j = 0; size_t i, j = 0;
...@@ -960,7 +960,7 @@ linuxNodeGetCPUStats(FILE *procstat, ...@@ -960,7 +960,7 @@ linuxNodeGetCPUStats(FILE *procstat,
} }
static int static int
linuxNodeGetMemoryStats(FILE *meminfo, virHostMemGetStatsLinux(FILE *meminfo,
int cellNum, int cellNum,
virNodeMemoryStatsPtr params, virNodeMemoryStatsPtr params,
int *nparams) int *nparams)
...@@ -1247,7 +1247,7 @@ nodeGetInfo(virNodeInfoPtr nodeinfo) ...@@ -1247,7 +1247,7 @@ nodeGetInfo(virNodeInfoPtr nodeinfo)
if (virStrcpyStatic(nodeinfo->model, virArchToString(hostarch)) == NULL) if (virStrcpyStatic(nodeinfo->model, virArchToString(hostarch)) == NULL)
return -1; return -1;
if (nodeGetMemory(&memorybytes, NULL) < 0) if (virHostMemGetInfo(&memorybytes, NULL) < 0)
return -1; return -1;
nodeinfo->memory = memorybytes / 1024; nodeinfo->memory = memorybytes / 1024;
...@@ -1292,7 +1292,7 @@ nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED, ...@@ -1292,7 +1292,7 @@ nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED,
} }
int int
nodeGetMemoryStats(int cellNum ATTRIBUTE_UNUSED, virHostMemGetStats(int cellNum ATTRIBUTE_UNUSED,
virNodeMemoryStatsPtr params ATTRIBUTE_UNUSED, virNodeMemoryStatsPtr params ATTRIBUTE_UNUSED,
int *nparams ATTRIBUTE_UNUSED, int *nparams ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
...@@ -1333,14 +1333,14 @@ nodeGetMemoryStats(int cellNum ATTRIBUTE_UNUSED, ...@@ -1333,14 +1333,14 @@ nodeGetMemoryStats(int cellNum ATTRIBUTE_UNUSED,
VIR_FREE(meminfo_path); VIR_FREE(meminfo_path);
return -1; return -1;
} }
ret = linuxNodeGetMemoryStats(meminfo, cellNum, params, nparams); ret = virHostMemGetStatsLinux(meminfo, cellNum, params, nparams);
VIR_FORCE_FCLOSE(meminfo); VIR_FORCE_FCLOSE(meminfo);
VIR_FREE(meminfo_path); VIR_FREE(meminfo_path);
return ret; return ret;
} }
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
return freebsdNodeGetMemoryStats(params, nparams); return virHostMemGetStatsFreeBSD(params, nparams);
#else #else
virReportError(VIR_ERR_NO_SUPPORT, "%s", virReportError(VIR_ERR_NO_SUPPORT, "%s",
_("node memory stats not implemented on this platform")); _("node memory stats not implemented on this platform"));
...@@ -1491,7 +1491,7 @@ nodeGetOnlineCPUBitmap(void) ...@@ -1491,7 +1491,7 @@ nodeGetOnlineCPUBitmap(void)
#ifdef __linux__ #ifdef __linux__
static int static int
nodeSetMemoryParameterValue(virTypedParameterPtr param) virHostMemSetParameterValue(virTypedParameterPtr param)
{ {
char *path = NULL; char *path = NULL;
char *strval = NULL; char *strval = NULL;
...@@ -1525,8 +1525,8 @@ nodeSetMemoryParameterValue(virTypedParameterPtr param) ...@@ -1525,8 +1525,8 @@ nodeSetMemoryParameterValue(virTypedParameterPtr param)
} }
static bool static bool
nodeMemoryParametersIsAllSupported(virTypedParameterPtr params, virHostMemParametersAreAllSupported(virTypedParameterPtr params,
int nparams) int nparams)
{ {
char *path = NULL; char *path = NULL;
size_t i; size_t i;
...@@ -1557,7 +1557,7 @@ nodeMemoryParametersIsAllSupported(virTypedParameterPtr params, ...@@ -1557,7 +1557,7 @@ nodeMemoryParametersIsAllSupported(virTypedParameterPtr params,
#endif #endif
int int
nodeSetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, virHostMemSetParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
int nparams ATTRIBUTE_UNUSED, int nparams ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
...@@ -1577,11 +1577,11 @@ nodeSetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1577,11 +1577,11 @@ nodeSetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
NULL) < 0) NULL) < 0)
return -1; return -1;
if (!nodeMemoryParametersIsAllSupported(params, nparams)) if (!virHostMemParametersAreAllSupported(params, nparams))
return -1; return -1;
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
rc = nodeSetMemoryParameterValue(&params[i]); rc = virHostMemSetParameterValue(&params[i]);
if (rc < 0) if (rc < 0)
return -1; return -1;
...@@ -1598,7 +1598,7 @@ nodeSetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1598,7 +1598,7 @@ nodeSetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
#ifdef __linux__ #ifdef __linux__
static int static int
nodeGetMemoryParameterValue(const char *field, virHostMemGetParameterValue(const char *field,
void *value) void *value)
{ {
char *path = NULL; char *path = NULL;
...@@ -1649,7 +1649,7 @@ nodeGetMemoryParameterValue(const char *field, ...@@ -1649,7 +1649,7 @@ nodeGetMemoryParameterValue(const char *field,
#define NODE_MEMORY_PARAMETERS_NUM 8 #define NODE_MEMORY_PARAMETERS_NUM 8
int int
nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, virHostMemGetParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
int *nparams ATTRIBUTE_UNUSED, int *nparams ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
...@@ -1677,7 +1677,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1677,7 +1677,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
switch (i) { switch (i) {
case 0: case 0:
ret = nodeGetMemoryParameterValue("pages_to_scan", &pages_to_scan); ret = virHostMemGetParameterValue("pages_to_scan", &pages_to_scan);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1690,7 +1690,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1690,7 +1690,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
break; break;
case 1: case 1:
ret = nodeGetMemoryParameterValue("sleep_millisecs", &sleep_millisecs); ret = virHostMemGetParameterValue("sleep_millisecs", &sleep_millisecs);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1703,7 +1703,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1703,7 +1703,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
break; break;
case 2: case 2:
ret = nodeGetMemoryParameterValue("pages_shared", &pages_shared); ret = virHostMemGetParameterValue("pages_shared", &pages_shared);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1716,7 +1716,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1716,7 +1716,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
break; break;
case 3: case 3:
ret = nodeGetMemoryParameterValue("pages_sharing", &pages_sharing); ret = virHostMemGetParameterValue("pages_sharing", &pages_sharing);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1729,7 +1729,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1729,7 +1729,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
break; break;
case 4: case 4:
ret = nodeGetMemoryParameterValue("pages_unshared", &pages_unshared); ret = virHostMemGetParameterValue("pages_unshared", &pages_unshared);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1742,7 +1742,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1742,7 +1742,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
break; break;
case 5: case 5:
ret = nodeGetMemoryParameterValue("pages_volatile", &pages_volatile); ret = virHostMemGetParameterValue("pages_volatile", &pages_volatile);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1755,7 +1755,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1755,7 +1755,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
break; break;
case 6: case 6:
ret = nodeGetMemoryParameterValue("full_scans", &full_scans); ret = virHostMemGetParameterValue("full_scans", &full_scans);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1768,7 +1768,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, ...@@ -1768,7 +1768,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
break; break;
case 7: case 7:
ret = nodeGetMemoryParameterValue("merge_across_nodes", &merge_across_nodes); ret = virHostMemGetParameterValue("merge_across_nodes", &merge_across_nodes);
if (ret == -2) if (ret == -2)
continue; continue;
else if (ret == -1) else if (ret == -1)
...@@ -1886,7 +1886,7 @@ nodeCapsInitNUMAFake(const char *cpupath ATTRIBUTE_UNUSED, ...@@ -1886,7 +1886,7 @@ nodeCapsInitNUMAFake(const char *cpupath ATTRIBUTE_UNUSED,
} }
static int static int
nodeGetCellsFreeMemoryFake(unsigned long long *freeMems, virHostMemGetCellsFreeFake(unsigned long long *freeMems,
int startCell, int startCell,
int maxCells ATTRIBUTE_UNUSED) int maxCells ATTRIBUTE_UNUSED)
{ {
...@@ -1911,8 +1911,8 @@ nodeGetCellsFreeMemoryFake(unsigned long long *freeMems, ...@@ -1911,8 +1911,8 @@ nodeGetCellsFreeMemoryFake(unsigned long long *freeMems,
} }
static int static int
nodeGetMemoryFake(unsigned long long *mem, virHostMemGetInfoFake(unsigned long long *mem,
unsigned long long *freeMem) unsigned long long *freeMem)
{ {
int ret = -1; int ret = -1;
...@@ -2140,7 +2140,7 @@ nodeCapsInitNUMA(virCapsPtr caps) ...@@ -2140,7 +2140,7 @@ nodeCapsInitNUMA(virCapsPtr caps)
int int
nodeGetCellsFreeMemory(unsigned long long *freeMems, virHostMemGetCellsFree(unsigned long long *freeMems,
int startCell, int startCell,
int maxCells) int maxCells)
{ {
...@@ -2150,7 +2150,7 @@ nodeGetCellsFreeMemory(unsigned long long *freeMems, ...@@ -2150,7 +2150,7 @@ nodeGetCellsFreeMemory(unsigned long long *freeMems,
int maxCell; int maxCell;
if (!virNumaIsAvailable()) if (!virNumaIsAvailable())
return nodeGetCellsFreeMemoryFake(freeMems, return virHostMemGetCellsFreeFake(freeMems,
startCell, maxCells); startCell, maxCells);
if ((maxCell = virNumaGetMaxNode()) < 0) if ((maxCell = virNumaGetMaxNode()) < 0)
...@@ -2178,8 +2178,8 @@ nodeGetCellsFreeMemory(unsigned long long *freeMems, ...@@ -2178,8 +2178,8 @@ nodeGetCellsFreeMemory(unsigned long long *freeMems,
} }
int int
nodeGetMemory(unsigned long long *mem, virHostMemGetInfo(unsigned long long *mem,
unsigned long long *freeMem) unsigned long long *freeMem)
{ {
int max_node; int max_node;
int n; int n;
...@@ -2191,7 +2191,7 @@ nodeGetMemory(unsigned long long *mem, ...@@ -2191,7 +2191,7 @@ nodeGetMemory(unsigned long long *mem,
*freeMem = 0; *freeMem = 0;
if (!virNumaIsAvailable()) if (!virNumaIsAvailable())
return nodeGetMemoryFake(mem, freeMem); return virHostMemGetInfoFake(mem, freeMem);
if ((max_node = virNumaGetMaxNode()) < 0) if ((max_node = virNumaGetMaxNode()) < 0)
return -1; return -1;
...@@ -2216,11 +2216,11 @@ nodeGetMemory(unsigned long long *mem, ...@@ -2216,11 +2216,11 @@ nodeGetMemory(unsigned long long *mem,
} }
int int
nodeGetFreePages(unsigned int npages, virHostMemGetFreePages(unsigned int npages,
unsigned int *pages, unsigned int *pages,
int startCell, int startCell,
unsigned int cellCount, unsigned int cellCount,
unsigned long long *counts) unsigned long long *counts)
{ {
int ret = -1; int ret = -1;
int cell, lastCell; int cell, lastCell;
...@@ -2262,12 +2262,12 @@ nodeGetFreePages(unsigned int npages, ...@@ -2262,12 +2262,12 @@ nodeGetFreePages(unsigned int npages,
} }
int int
nodeAllocPages(unsigned int npages, virHostMemAllocPages(unsigned int npages,
unsigned int *pageSizes, unsigned int *pageSizes,
unsigned long long *pageCounts, unsigned long long *pageCounts,
int startCell, int startCell,
unsigned int cellCount, unsigned int cellCount,
bool add) bool add)
{ {
int ret = -1; int ret = -1;
int cell, lastCell; int cell, lastCell;
......
src/nodeinfo.h
浏览文件 @ dcfe37e6
...@@ -33,26 +33,26 @@ int nodeGetCPUStats(int cpuNum, ...@@ -33,26 +33,26 @@ int nodeGetCPUStats(int cpuNum,
virNodeCPUStatsPtr params, virNodeCPUStatsPtr params,
int *nparams, int *nparams,
unsigned int flags); unsigned int flags);
int nodeGetMemoryStats(int cellNum, int virHostMemGetStats(int cellNum,
virNodeMemoryStatsPtr params, virNodeMemoryStatsPtr params,
int *nparams, int *nparams,
unsigned int flags); unsigned int flags);
int nodeGetCellsFreeMemory(unsigned long long *freeMems, int virHostMemGetCellsFree(unsigned long long *freeMems,
int startCell, int startCell,
int maxCells); int maxCells);
int nodeGetMemory(unsigned long long *mem, int virHostMemGetInfo(unsigned long long *mem,
unsigned long long *freeMem); unsigned long long *freeMem);
virBitmapPtr nodeGetPresentCPUBitmap(void); virBitmapPtr nodeGetPresentCPUBitmap(void);
virBitmapPtr nodeGetOnlineCPUBitmap(void); virBitmapPtr nodeGetOnlineCPUBitmap(void);
int nodeGetCPUCount(void); int nodeGetCPUCount(void);
int nodeGetThreadsPerSubcore(virArch arch); int nodeGetThreadsPerSubcore(virArch arch);
int nodeGetMemoryParameters(virTypedParameterPtr params, int virHostMemGetParameters(virTypedParameterPtr params,
int *nparams, int *nparams,
unsigned int flags); unsigned int flags);
int nodeSetMemoryParameters(virTypedParameterPtr params, int virHostMemSetParameters(virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags); unsigned int flags);
...@@ -60,16 +60,17 @@ int nodeGetCPUMap(unsigned char **cpumap, ...@@ -60,16 +60,17 @@ int nodeGetCPUMap(unsigned char **cpumap,
unsigned int *online, unsigned int *online,
unsigned int flags); unsigned int flags);
int nodeGetFreePages(unsigned int npages, int virHostMemGetFreePages(unsigned int npages,
unsigned int *pages, unsigned int *pages,
int startCell, int startCell,
unsigned int cellCount, unsigned int cellCount,
unsigned long long *counts); unsigned long long *counts);
int virHostMemAllocPages(unsigned int npages,
unsigned int *pageSizes,
unsigned long long *pageCounts,
int startCell,
unsigned int cellCount,
bool add);
int nodeAllocPages(unsigned int npages,
unsigned int *pageSizes,
unsigned long long *pageCounts,
int startCell,
unsigned int cellCount,
bool add);
#endif /* __VIR_NODEINFO_H__*/ #endif /* __VIR_NODEINFO_H__*/
src/openvz/openvz_driver.c
浏览文件 @ dcfe37e6
...@@ -2179,7 +2179,7 @@ openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -2179,7 +2179,7 @@ openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
int *nparams, int *nparams,
unsigned int flags) unsigned int flags)
{ {
return nodeGetMemoryStats(cellNum, params, nparams, flags); return virHostMemGetStats(cellNum, params, nparams, flags);
} }
...@@ -2189,7 +2189,7 @@ openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -2189,7 +2189,7 @@ openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
int startCell, int startCell,
int maxCells) int maxCells)
{ {
return nodeGetCellsFreeMemory(freeMems, startCell, maxCells); return virHostMemGetCellsFree(freeMems, startCell, maxCells);
} }
...@@ -2197,7 +2197,7 @@ static unsigned long long ...@@ -2197,7 +2197,7 @@ static unsigned long long
openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
unsigned long long freeMem; unsigned long long freeMem;
if (nodeGetMemory(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
return 0; return 0;
return freeMem; return freeMem;
} }
......
src/qemu/qemu_driver.c
浏览文件 @ dcfe37e6
...@@ -18109,7 +18109,7 @@ qemuNodeGetMemoryStats(virConnectPtr conn, ...@@ -18109,7 +18109,7 @@ qemuNodeGetMemoryStats(virConnectPtr conn,
if (virNodeGetMemoryStatsEnsureACL(conn) < 0) if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryStats(cellNum, params, nparams, flags); return virHostMemGetStats(cellNum, params, nparams, flags);
} }
...@@ -18122,7 +18122,7 @@ qemuNodeGetCellsFreeMemory(virConnectPtr conn, ...@@ -18122,7 +18122,7 @@ qemuNodeGetCellsFreeMemory(virConnectPtr conn,
if (virNodeGetCellsFreeMemoryEnsureACL(conn) < 0) if (virNodeGetCellsFreeMemoryEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetCellsFreeMemory(freeMems, startCell, maxCells); return virHostMemGetCellsFree(freeMems, startCell, maxCells);
} }
...@@ -18134,7 +18134,7 @@ qemuNodeGetFreeMemory(virConnectPtr conn) ...@@ -18134,7 +18134,7 @@ qemuNodeGetFreeMemory(virConnectPtr conn)
if (virNodeGetFreeMemoryEnsureACL(conn) < 0) if (virNodeGetFreeMemoryEnsureACL(conn) < 0)
return 0; return 0;
if (nodeGetMemory(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
return 0; return 0;
return freeMem; return freeMem;
...@@ -18150,7 +18150,7 @@ qemuNodeGetMemoryParameters(virConnectPtr conn, ...@@ -18150,7 +18150,7 @@ qemuNodeGetMemoryParameters(virConnectPtr conn,
if (virNodeGetMemoryParametersEnsureACL(conn) < 0) if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryParameters(params, nparams, flags); return virHostMemGetParameters(params, nparams, flags);
} }
...@@ -18163,7 +18163,7 @@ qemuNodeSetMemoryParameters(virConnectPtr conn, ...@@ -18163,7 +18163,7 @@ qemuNodeSetMemoryParameters(virConnectPtr conn,
if (virNodeSetMemoryParametersEnsureACL(conn) < 0) if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeSetMemoryParameters(params, nparams, flags); return virHostMemSetParameters(params, nparams, flags);
} }
...@@ -18434,7 +18434,7 @@ qemuNodeGetFreePages(virConnectPtr conn, ...@@ -18434,7 +18434,7 @@ qemuNodeGetFreePages(virConnectPtr conn,
if (virNodeGetFreePagesEnsureACL(conn) < 0) if (virNodeGetFreePagesEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetFreePages(npages, pages, startCell, cellCount, counts); return virHostMemGetFreePages(npages, pages, startCell, cellCount, counts);
} }
...@@ -19337,8 +19337,8 @@ qemuNodeAllocPages(virConnectPtr conn, ...@@ -19337,8 +19337,8 @@ qemuNodeAllocPages(virConnectPtr conn,
if (virNodeAllocPagesEnsureACL(conn) < 0) if (virNodeAllocPagesEnsureACL(conn) < 0)
return -1; return -1;
return nodeAllocPages(npages, pageSizes, pageCounts, return virHostMemAllocPages(npages, pageSizes, pageCounts,
startCell, cellCount, add); startCell, cellCount, add);
} }
......
src/uml/uml_driver.c
浏览文件 @ dcfe37e6
...@@ -2802,7 +2802,7 @@ umlNodeGetMemoryStats(virConnectPtr conn, ...@@ -2802,7 +2802,7 @@ umlNodeGetMemoryStats(virConnectPtr conn,
if (virNodeGetMemoryStatsEnsureACL(conn) < 0) if (virNodeGetMemoryStatsEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryStats(cellNum, params, nparams, flags); return virHostMemGetStats(cellNum, params, nparams, flags);
} }
...@@ -2815,7 +2815,7 @@ umlNodeGetCellsFreeMemory(virConnectPtr conn, ...@@ -2815,7 +2815,7 @@ umlNodeGetCellsFreeMemory(virConnectPtr conn,
if (virNodeGetCellsFreeMemoryEnsureACL(conn) < 0) if (virNodeGetCellsFreeMemoryEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetCellsFreeMemory(freeMems, startCell, maxCells); return virHostMemGetCellsFree(freeMems, startCell, maxCells);
} }
...@@ -2827,7 +2827,7 @@ umlNodeGetFreeMemory(virConnectPtr conn) ...@@ -2827,7 +2827,7 @@ umlNodeGetFreeMemory(virConnectPtr conn)
if (virNodeGetFreeMemoryEnsureACL(conn) < 0) if (virNodeGetFreeMemoryEnsureACL(conn) < 0)
return 0; return 0;
if (nodeGetMemory(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
return 0; return 0;
return freeMem; return freeMem;
...@@ -2843,7 +2843,7 @@ umlNodeGetMemoryParameters(virConnectPtr conn, ...@@ -2843,7 +2843,7 @@ umlNodeGetMemoryParameters(virConnectPtr conn,
if (virNodeGetMemoryParametersEnsureACL(conn) < 0) if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryParameters(params, nparams, flags); return virHostMemGetParameters(params, nparams, flags);
} }
...@@ -2856,7 +2856,7 @@ umlNodeSetMemoryParameters(virConnectPtr conn, ...@@ -2856,7 +2856,7 @@ umlNodeSetMemoryParameters(virConnectPtr conn,
if (virNodeSetMemoryParametersEnsureACL(conn) < 0) if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeSetMemoryParameters(params, nparams, flags); return virHostMemSetParameters(params, nparams, flags);
} }
...@@ -2900,7 +2900,7 @@ umlNodeGetFreePages(virConnectPtr conn, ...@@ -2900,7 +2900,7 @@ umlNodeGetFreePages(virConnectPtr conn,
if (virNodeGetFreePagesEnsureACL(conn) < 0) if (virNodeGetFreePagesEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetFreePages(npages, pages, startCell, cellCount, counts); return virHostMemGetFreePages(npages, pages, startCell, cellCount, counts);
} }
...@@ -2920,8 +2920,8 @@ umlNodeAllocPages(virConnectPtr conn, ...@@ -2920,8 +2920,8 @@ umlNodeAllocPages(virConnectPtr conn,
if (virNodeAllocPagesEnsureACL(conn) < 0) if (virNodeAllocPagesEnsureACL(conn) < 0)
return -1; return -1;
return nodeAllocPages(npages, pageSizes, pageCounts, return virHostMemAllocPages(npages, pageSizes, pageCounts,
startCell, cellCount, add); startCell, cellCount, add);
} }
......
src/util/virnuma.c
浏览文件 @ dcfe37e6
...@@ -659,7 +659,7 @@ virNumaGetPageInfo(int node, ...@@ -659,7 +659,7 @@ virNumaGetPageInfo(int node,
/* TODO: come up with better algorithm that takes huge pages into /* TODO: come up with better algorithm that takes huge pages into
* account. The problem is huge pages cut off regular memory. */ * account. The problem is huge pages cut off regular memory. */
if (node == -1) { if (node == -1) {
if (nodeGetMemory(&memsize, &memfree) < 0) if (virHostMemGetInfo(&memsize, &memfree) < 0)
goto cleanup; goto cleanup;
} else { } else {
if (virNumaGetNodeMemory(node, &memsize, &memfree) < 0) if (virNumaGetNodeMemory(node, &memsize, &memfree) < 0)
......
src/vbox/vbox_common.c
浏览文件 @ dcfe37e6
...@@ -7536,14 +7536,14 @@ vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -7536,14 +7536,14 @@ vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
int startCell, int startCell,
int maxCells) int maxCells)
{ {
return nodeGetCellsFreeMemory(freeMems, startCell, maxCells); return virHostMemGetCellsFree(freeMems, startCell, maxCells);
} }
static unsigned long long static unsigned long long
vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
unsigned long long freeMem; unsigned long long freeMem;
if (nodeGetMemory(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
return 0; return 0;
return freeMem; return freeMem;
} }
...@@ -7559,7 +7559,7 @@ vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -7559,7 +7559,7 @@ vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED,
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);
return nodeGetFreePages(npages, pages, startCell, cellCount, counts); return virHostMemGetFreePages(npages, pages, startCell, cellCount, counts);
} }
static int static int
...@@ -7575,8 +7575,8 @@ vboxNodeAllocPages(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -7575,8 +7575,8 @@ vboxNodeAllocPages(virConnectPtr conn ATTRIBUTE_UNUSED,
virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1); virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1);
return nodeAllocPages(npages, pageSizes, pageCounts, return virHostMemAllocPages(npages, pageSizes, pageCounts,
startCell, cellCount, add); startCell, cellCount, add);
} }
static int static int
......
src/vz/vz_driver.c
浏览文件 @ dcfe37e6
...@@ -1487,7 +1487,7 @@ vzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -1487,7 +1487,7 @@ vzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
int *nparams, int *nparams,
unsigned int flags) unsigned int flags)
{ {
return nodeGetMemoryStats(cellNum, params, nparams, flags); return virHostMemGetStats(cellNum, params, nparams, flags);
} }
static int static int
...@@ -1496,14 +1496,14 @@ vzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -1496,14 +1496,14 @@ vzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
int startCell, int startCell,
int maxCells) int maxCells)
{ {
return nodeGetCellsFreeMemory(freeMems, startCell, maxCells); return virHostMemGetCellsFree(freeMems, startCell, maxCells);
} }
static unsigned long long static unsigned long long
vzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) vzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
unsigned long long freeMem; unsigned long long freeMem;
if (nodeGetMemory(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
return 0; return 0;
return freeMem; return freeMem;
} }
......
src/xen/xen_driver.c
浏览文件 @ dcfe37e6
...@@ -2564,7 +2564,7 @@ xenUnifiedNodeGetMemoryParameters(virConnectPtr conn, ...@@ -2564,7 +2564,7 @@ xenUnifiedNodeGetMemoryParameters(virConnectPtr conn,
if (virNodeGetMemoryParametersEnsureACL(conn) < 0) if (virNodeGetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeGetMemoryParameters(params, nparams, flags); return virHostMemGetParameters(params, nparams, flags);
} }
...@@ -2577,7 +2577,7 @@ xenUnifiedNodeSetMemoryParameters(virConnectPtr conn, ...@@ -2577,7 +2577,7 @@ xenUnifiedNodeSetMemoryParameters(virConnectPtr conn,
if (virNodeSetMemoryParametersEnsureACL(conn) < 0) if (virNodeSetMemoryParametersEnsureACL(conn) < 0)
return -1; return -1;
return nodeSetMemoryParameters(params, nparams, flags); return virHostMemSetParameters(params, nparams, flags);
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或