External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 12:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodeinfo: Add sysfs_prefix to nodeGetCPUCount

Browse Source 
Add the sysfs_prefix argument to the call to allow for setting the
path for tests to something other than SYSFS_SYSTEM_PATH.
This commit is contained in:
John Ferlan 2015-07-07 19:49:10 -04:00
parent 3119e05e26
commit f1a43a0f91
7 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/lxc_controller.c
View File

@ -705,7 +705,7 @@ static int virLXCControllerSetupCpuAffinity(virLXCControllerPtr ctrl)
/* setaffinity fails if you set bits for CPUs which
* aren't present, so we have to limit ourselves */
if ((hostcpus = nodeGetCPUCount()) < 0)
if ((hostcpus = nodeGetCPUCount(NULL)) < 0)
return -1;
if (maxcpu > hostcpus)

20
src/nodeinfo.c
View File

@ -1195,7 +1195,7 @@ int nodeGetMemoryStats(int cellNum ATTRIBUTE_UNUSED,
}
int
nodeGetCPUCount(void)
nodeGetCPUCount(const char *sysfs_prefix ATTRIBUTE_UNUSED)
{
#if defined(__linux__)
/* To support older kernels that lack cpu/present, such as 2.6.18
@ -1204,21 +1204,27 @@ nodeGetCPUCount(void)
* will be consecutive.
*/
char *present_path = NULL;
const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH;
char *cpupath = NULL;
int ncpu = -1;
if (!(present_path = linuxGetCPUPresentPath(NULL)))
if (!(present_path = linuxGetCPUPresentPath(prefix)))
return -1;
if (virFileExists(present_path)) {
ncpu = linuxParseCPUmax(present_path);
} else if (virFileExists(SYSFS_SYSTEM_PATH "/cpu/cpu0")) {
goto cleanup;
}
if (virAsprintf(&cpupath, "%s/cpu/cpu0", prefix) < 0)
goto cleanup;
if (virFileExists(cpupath)) {
ncpu = 0;
do {
ncpu++;
VIR_FREE(cpupath);
if (virAsprintf(&cpupath, "%s/cpu/cpu%d",
SYSFS_SYSTEM_PATH, ncpu) < 0) {
prefix, ncpu) < 0) {
ncpu = -1;
goto cleanup;
}
@ -1251,7 +1257,7 @@ nodeGetPresentCPUBitmap(void)
virBitmapPtr bitmap = NULL;
#endif
if ((max_present = nodeGetCPUCount()) < 0)
if ((max_present = nodeGetCPUCount(NULL)) < 0)
return NULL;
#ifdef __linux__
@ -1274,7 +1280,7 @@ nodeGetCPUBitmap(int *max_id ATTRIBUTE_UNUSED)
virBitmapPtr cpumap;
int present;
present = nodeGetCPUCount();
present = nodeGetCPUCount(NULL);
if (present < 0)
return NULL;
@ -1621,7 +1627,7 @@ nodeGetCPUMap(unsigned char **cpumap,
virCheckFlags(0, -1);
if (!cpumap && !online)
return nodeGetCPUCount();
return nodeGetCPUCount(NULL);
if (!(cpus = nodeGetCPUBitmap(&maxpresent)))
goto cleanup;

2
src/nodeinfo.h
View File

@ -45,7 +45,7 @@ int nodeGetMemory(unsigned long long *mem,
virBitmapPtr nodeGetPresentCPUBitmap(void);
virBitmapPtr nodeGetCPUBitmap(int *max_id);
int nodeGetCPUCount(void);
int nodeGetCPUCount(const char *sysfs_prefix);
int nodeGetMemoryParameters(virTypedParameterPtr params,
int *nparams,

6
src/qemu/qemu_driver.c
View File

@ -5237,7 +5237,7 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
if (!(def = virDomainObjGetOneDef(vm, flags)))
goto cleanup;
if ((hostcpus = nodeGetCPUCount()) < 0)
if ((hostcpus = nodeGetCPUCount(NULL)) < 0)
goto cleanup;
if (!(allcpumap = virBitmapNew(hostcpus)))
@ -5425,7 +5425,7 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
if (!(def = virDomainObjGetOneDef(vm, flags)))
goto cleanup;
if ((hostcpus = nodeGetCPUCount()) < 0)
if ((hostcpus = nodeGetCPUCount(NULL)) < 0)
goto cleanup;
if (def->cputune.emulatorpin) {
@ -5668,7 +5668,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
if (targetDef->iothreads == 0)
return 0;
if ((hostcpus = nodeGetCPUCount()) < 0)
if ((hostcpus = nodeGetCPUCount(NULL)) < 0)
goto cleanup;
if (VIR_ALLOC_N(info_ret, targetDef->iothreads) < 0)

2
src/qemu/qemu_process.c
View File

@ -2373,7 +2373,7 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
/* setaffinity fails if you set bits for CPUs which
* aren't present, so we have to limit ourselves */
if ((hostcpus = nodeGetCPUCount()) < 0)
if ((hostcpus = nodeGetCPUCount(NULL)) < 0)
goto cleanup;
if (hostcpus > QEMUD_CPUMASK_LEN)

2
src/vz/vz_sdk.c
View File

@ -1141,7 +1141,7 @@ prlsdkConvertCpuInfo(PRL_HANDLE sdkdom,
PRL_RESULT pret;
int ret = -1;
if ((hostcpus = nodeGetCPUCount()) < 0)
if ((hostcpus = nodeGetCPUCount(NULL)) < 0)
goto cleanup;
/* get number of CPUs */

4
tests/vircgrouptest.c
View File

@ -649,8 +649,8 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
goto cleanup;
}
if (nodeGetCPUCount() != EXPECTED_NCPUS) {
fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount());
if (nodeGetCPUCount(NULL) != EXPECTED_NCPUS) {
fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount(NULL));
goto cleanup;
}