|
 |
7a3408 |
From 276ade698758d0fe906f48b525fc803e6a072458 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <276ade698758d0fe906f48b525fc803e6a072458@dist-git>
|
|
|
7a3408 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Date: Wed, 5 Aug 2015 18:18:18 +0200
|
|
|
7a3408 |
Subject: [PATCH] nodeinfo: Formatting changes
|
|
|
7a3408 |
|
|
|
7a3408 |
(cherry picked from commit aa6c3fee866312ad02f675cd69b82ada7d1e0dfd)
|
|
|
7a3408 |
|
|
|
7a3408 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1213713
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/nodeinfo.c | 36 ++++++++++++++++++++----------------
|
|
|
7a3408 |
1 file changed, 20 insertions(+), 16 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
|
|
|
7a3408 |
index 60dfc8b..c874fa6 100644
|
|
|
7a3408 |
--- a/src/nodeinfo.c
|
|
|
7a3408 |
+++ b/src/nodeinfo.c
|
|
|
7a3408 |
@@ -208,7 +208,7 @@ freebsdNodeGetCPUStats(int cpuNum,
|
|
|
7a3408 |
|
|
|
7a3408 |
static int
|
|
|
7a3408 |
freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params,
|
|
|
7a3408 |
- int *nparams)
|
|
|
7a3408 |
+ int *nparams)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
size_t i, j = 0;
|
|
|
7a3408 |
unsigned long pagesize = getpagesize() >> 10;
|
|
|
7a3408 |
@@ -552,10 +552,11 @@ virNodeParseNode(const char *sysfs_prefix,
|
|
|
7a3408 |
return ret;
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
-int linuxNodeInfoCPUPopulate(const char *sysfs_prefix,
|
|
|
7a3408 |
- FILE *cpuinfo,
|
|
|
7a3408 |
- virArch arch,
|
|
|
7a3408 |
- virNodeInfoPtr nodeinfo)
|
|
|
7a3408 |
+int
|
|
|
7a3408 |
+linuxNodeInfoCPUPopulate(const char *sysfs_prefix,
|
|
|
7a3408 |
+ FILE *cpuinfo,
|
|
|
7a3408 |
+ virArch arch,
|
|
|
7a3408 |
+ virNodeInfoPtr nodeinfo)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH;
|
|
|
7a3408 |
char line[1024];
|
|
|
7a3408 |
@@ -1046,8 +1047,9 @@ virNodeGetSiblingsList(const char *dir, int cpu_id)
|
|
|
7a3408 |
}
|
|
|
7a3408 |
#endif
|
|
|
7a3408 |
|
|
|
7a3408 |
-int nodeGetInfo(const char *sysfs_prefix ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- virNodeInfoPtr nodeinfo)
|
|
|
7a3408 |
+int
|
|
|
7a3408 |
+nodeGetInfo(const char *sysfs_prefix ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ virNodeInfoPtr nodeinfo)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
virArch hostarch = virArchFromHost();
|
|
|
7a3408 |
|
|
|
7a3408 |
@@ -1123,10 +1125,11 @@ int nodeGetInfo(const char *sysfs_prefix ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
#endif
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
-int nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- virNodeCPUStatsPtr params ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- int *nparams ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- unsigned int flags)
|
|
|
7a3408 |
+int
|
|
|
7a3408 |
+nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ virNodeCPUStatsPtr params ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ int *nparams ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ unsigned int flags)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
virCheckFlags(0, -1);
|
|
|
7a3408 |
|
|
|
7a3408 |
@@ -1153,11 +1156,12 @@ int nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
#endif
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
-int nodeGetMemoryStats(const char *sysfs_prefix ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- int cellNum ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- virNodeMemoryStatsPtr params ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- int *nparams ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
- unsigned int flags)
|
|
|
7a3408 |
+int
|
|
|
7a3408 |
+nodeGetMemoryStats(const char *sysfs_prefix ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ int cellNum ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ virNodeMemoryStatsPtr params ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ int *nparams ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
+ unsigned int flags)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
virCheckFlags(0, -1);
|
|
|
7a3408 |
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.0
|
|
|
7a3408 |
|