NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Modify the tests/nodeinfotest.c to use sysfs in addition

Browse Source 
to proc/cpuinfo

This patch creates a new sysfs hierarchy under
tests/nodeinfodata/linux-nodeinfo-sysfs-test-1.
Output files and /proc/cpuinfo files are also respectively added for
both x86 and ppc64.

Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
This commit is contained in:
Prerna Saxena
2011-12-01 12:47:52 +05:30
committed by Stefan Berger
parent f99b3b4b50
commit 82ff25e108
43 changed files with 113 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/nodeinfotest.c
View File

@@ -13,7 +13,9 @@
#if ! (defined __linux__ && (defined(__x86_64__) || \
defined(__amd64__) || \
defined(__i386__)))
defined(__i386__) || \
defined(__powerpc__) || \
defined(__powerpc64__)))
int
main(void)
@@ -23,11 +25,14 @@ main(void)
#else
extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo,
bool need_hyperthreads);
extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
char *sysfs_cpuinfo,
virNodeInfoPtr nodeinfo);
static int
linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile)
linuxTestCompareFiles(const char *cpuinfofile,
char *sysfs_cpuinfo,
const char *outputfile)
{
int ret = -1;
char *actualData = NULL;
@@ -43,7 +48,7 @@ linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile)
goto fail;
memset(&nodeinfo, 0, sizeof(nodeinfo));
if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo, false) < 0) {
if (linuxNodeInfoCPUPopulate(cpuinfo, sysfs_cpuinfo, &nodeinfo) < 0) {
if (virTestGetDebug()) {
virErrorPtr error = virSaveLastError();
if (error && error->code != VIR_ERR_OK)
@@ -87,16 +92,29 @@ linuxTestNodeInfo(const void *data)
{
int result = -1;
char *cpuinfo = NULL;
char *sysfs_cpuinfo = NULL;
char *output = NULL;
if (virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s.cpuinfo",
# if defined(__powerpc__) || \
defined(__powerpc64__)
if (virAsprintf(&sysfs_cpuinfo, "%s/nodeinfodata/linux-%s/cpu/",
abs_srcdir, (const char*)data) < 0 ||
virAsprintf(&output, "%s/nodeinfodata/linux-%s.txt",
virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-ppc.cpuinfo",
abs_srcdir, (const char*)data) < 0 ||
virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-ppc-output.txt",
abs_srcdir, (const char*)data) < 0) {
# else
if (virAsprintf(&sysfs_cpuinfo, "%s/nodeinfodata/linux-%s/cpu/",
abs_srcdir, (const char*)data) < 0 ||
virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-x86.cpuinfo",
abs_srcdir, (const char*)data) < 0 ||
virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-x86-output.txt",
abs_srcdir, (const char*)data) < 0) {
# endif
goto cleanup;
}
result = linuxTestCompareFiles(cpuinfo, output);
result = linuxTestCompareFiles(cpuinfo, sysfs_cpuinfo, output);
cleanup:
free(cpuinfo);
@@ -112,12 +130,7 @@ mymain(void)
int ret = 0;
int i;
const char *nodeData[] = {
"nodeinfo-1",
"nodeinfo-2",
"nodeinfo-3",
"nodeinfo-4",
"nodeinfo-5",
"nodeinfo-6",
"nodeinfo-sysfs-test-1",
};
if (virInitialize() < 0)