mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
9943276fd2
Return statements with parameter enclosed in parentheses were modified and parentheses were removed. The whole change was scripted, here is how: List of files was obtained using this command: git grep -l -e '\<return\s*([^()]*\(([^()]*)[^()]*\)*)\s*;' | \ grep -e '\.[ch]$' -e '\.py$' Found files were modified with this command: sed -i -e \ 's_^\(.*\<return\)\s*(\(\([^()]*([^()]*)[^()]*\)*\))\s*\(;.*$\)_\1 \2\4_' \ -e 's_^\(.*\<return\)\s*(\([^()]*\))\s*\(;.*$\)_\1 \2\3_' Then checked for nonsense. The whole command looks like this: git grep -l -e '\<return\s*([^()]*\(([^()]*)[^()]*\)*)\s*;' | \ grep -e '\.[ch]$' -e '\.py$' | xargs sed -i -e \ 's_^\(.*\<return\)\s*(\(\([^()]*([^()]*)[^()]*\)*\))\s*\(;.*$\)_\1 \2\4_' \ -e 's_^\(.*\<return\)\s*(\([^()]*\))\s*\(;.*$\)_\1 \2\3_'
150 lines
3.9 KiB
C
150 lines
3.9 KiB
C
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "testutils.h"
|
|
#include "internal.h"
|
|
#include "nodeinfo.h"
|
|
#include "util.h"
|
|
#include "virfile.h"
|
|
|
|
#if ! (defined __linux__ && (defined(__x86_64__) || \
|
|
defined(__amd64__) || \
|
|
defined(__i386__) || \
|
|
defined(__powerpc__) || \
|
|
defined(__powerpc64__)))
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#else
|
|
|
|
extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
|
|
char *sysfs_cpuinfo,
|
|
virNodeInfoPtr nodeinfo);
|
|
|
|
static int
|
|
linuxTestCompareFiles(const char *cpuinfofile,
|
|
char *sysfs_cpuinfo,
|
|
const char *outputfile)
|
|
{
|
|
int ret = -1;
|
|
char *actualData = NULL;
|
|
char *expectData = NULL;
|
|
virNodeInfo nodeinfo;
|
|
FILE *cpuinfo;
|
|
|
|
if (virtTestLoadFile(outputfile, &expectData) < 0)
|
|
goto fail;
|
|
|
|
cpuinfo = fopen(cpuinfofile, "r");
|
|
if (!cpuinfo)
|
|
goto fail;
|
|
|
|
memset(&nodeinfo, 0, sizeof(nodeinfo));
|
|
if (linuxNodeInfoCPUPopulate(cpuinfo, sysfs_cpuinfo, &nodeinfo) < 0) {
|
|
if (virTestGetDebug()) {
|
|
virErrorPtr error = virSaveLastError();
|
|
if (error && error->code != VIR_ERR_OK)
|
|
fprintf(stderr, "\n%s\n", error->message);
|
|
virFreeError(error);
|
|
}
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
|
goto fail;
|
|
}
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
|
|
|
/* 'nodes' is filled using libnuma.so from current machine
|
|
* topology, which makes it unsuitable for the test suite
|
|
* so blank it to a predictable value */
|
|
nodeinfo.nodes = 1;
|
|
|
|
if (virAsprintf(&actualData, "CPUs: %u, MHz: %u, Nodes: %u, Cores: %u\n",
|
|
nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes,
|
|
nodeinfo.cores) < 0)
|
|
goto fail;
|
|
|
|
if (STRNEQ(actualData, expectData)) {
|
|
if (getenv("DEBUG_TESTS")) {
|
|
printf("Expect %d '%s'\n", (int)strlen(expectData), expectData);
|
|
printf("Actual %d '%s'\n", (int)strlen(actualData), actualData);
|
|
}
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
VIR_FREE(expectData);
|
|
VIR_FREE(actualData);
|
|
return ret;
|
|
}
|
|
|
|
|
|
static int
|
|
linuxTestNodeInfo(const void *data)
|
|
{
|
|
int result = -1;
|
|
char *cpuinfo = NULL;
|
|
char *sysfs_cpuinfo = NULL;
|
|
char *output = NULL;
|
|
|
|
# if defined(__powerpc__) || \
|
|
defined(__powerpc64__)
|
|
if (virAsprintf(&sysfs_cpuinfo, "%s/nodeinfodata/linux-%s/cpu/",
|
|
abs_srcdir, (const char*)data) < 0 ||
|
|
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, sysfs_cpuinfo, output);
|
|
|
|
cleanup:
|
|
VIR_FREE(cpuinfo);
|
|
VIR_FREE(output);
|
|
VIR_FREE(sysfs_cpuinfo);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
int i;
|
|
const char *nodeData[] = {
|
|
"nodeinfo-sysfs-test-1",
|
|
};
|
|
|
|
if (virInitialize() < 0)
|
|
return EXIT_FAILURE;
|
|
|
|
for (i = 0 ; i < ARRAY_CARDINALITY(nodeData); i++)
|
|
if (virtTestRun(nodeData[i], 1, linuxTestNodeInfo, nodeData[i]) != 0)
|
|
ret = -1;
|
|
|
|
return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
#endif /* __linux__ */
|