6:26 a.m.
From: Prerna Saxena <prerna(a)linux.vnet.ibm.com>
Date: Tue, 17 Feb 2012 16:55:26 +0530
Subject: [PATCH 1/2] Implement sysinfo on PowerPC.
Libvirt on x86 parses 'dmidecode' to gather characteristics of host
system, which are then reflected to libvirt users by virSysinfoRead(),
invoked by 'virsh sysinfo'.
This patch implements it on PowerPC by reading /proc/cpuinfo.
The presently available fields in 'sysinfo' are strongly tied to
dmidecode output fields. This patch attempts to retrofit the
information available in PowerPC to appropriate sysinfo fields. I will
be happy to change the organization of this information to if there
are expected outputs for individual fields. (I couldnt find any
documentation which explained what each sysinfo field was expected
to convey.)
TODOS:
1. Adding Memory DIMM information
2) Firmware (<bios>) details.
3) Expand <processor> tag to have more fields available.
Example output on PowerPC :
virsh # sysinfo
<sysinfo type='smbios'>
<system>
<entry name='version'>PowerNV 8246-L2C</entry>
<entry name='serial'>8246-L2C</entry>
<entry name='family'>PowerNV</entry>
</system>
<processor>
<entry name='socket_destination'>0</entry>
<entry name='type'>POWER7 (raw), altivec supported</entry>
<entry name='version'>2.3 (pvr 003f 0203)</entry>
</processor>
<processor>
<entry name='socket_destination'>4</entry>
<entry name='type'>POWER7 (raw), altivec supported</entry>
<entry name='version'>2.3 (pvr 003f 0203)</entry>
</processor>
......
---
src/util/sysinfo.c | 131
+++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed,
129 insertions(+), 2 deletions(-)
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index 39c7581..0161b22 100644
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -44,6 +44,7 @@
__FUNCTION__, __LINE__, __VA_ARGS__)
#define SYSINFO_SMBIOS_DECODER "dmidecode"
+#define CPUINFO "/proc/cpuinfo"
VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST,
"smbios");
@@ -113,10 +114,136 @@ void virSysinfoDefFree(virSysinfoDefPtr def)
*
* Returns: a filled up sysinfo structure or NULL in case of error
*/
-#if defined(WIN32) || \
+
+#if defined(__powerpc__)
+static int
+virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret)
+{
+ char *cur, *eol = NULL;
+
+ if ((cur = strstr(base, "platform")) == NULL)
+ return 0;
+
+ base = cur;
+ /* Account for format 'platform : XXXX'*/
+ cur = strchr(cur, ':') + 1;
+ eol = strchr(cur, '\n');
+ if ((eol) &&
+ ((ret->system_family = strndup(cur, eol - cur)) == NULL))
+ goto no_memory;
+ virSkipSpaces(&(ret->system_family));
+
+ if ((cur = strstr(base, "model")) != NULL) {
+ cur = strchr(cur, ':') + 1;
+ eol = strchr(cur, '\n');
+ if ((eol) && ((ret->system_serial = strndup(cur, eol - cur))
+ == NULL))
+ goto no_memory;
+ virSkipSpaces(&(ret->system_serial));
+ }
+
+ if ((cur = strstr(base, "machine")) != NULL) {
+ cur = strchr(cur, ':') + 1;
+ eol = strchr(cur, '\n');
+ if ((eol) && ((ret->system_version = strndup(cur, eol - cur))
+ == NULL))
+ goto no_memory;
+ virSkipSpaces(&(ret->system_version));
+ }
+
+ return 0;
+
+no_memory:
+ return -1;
+}
+
+static int
+virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret)
+{
+ char *cur, *eol, *tmp_base;
+ virSysinfoProcessorDefPtr processor;
+
+ while((tmp_base = strstr(base, "processor")) != NULL) {
+ base = tmp_base;
+ eol = strchr(base, '\n');
+ cur = strchr(base, ':') + 1;
+
+ if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) {
+ goto no_memory;
+ }
+
+ processor = &ret->processor[ret->nprocessor - 1];
+ if ((eol) &&
+ ((processor->processor_socket_destination = strndup
+ (cur, eol - cur)) == NULL))
+ goto no_memory;
+ virSkipSpaces(&(processor->processor_socket_destination));
+
+ if ((cur = strstr(base, "cpu")) != NULL) {
+ cur = strchr(cur, ':') + 1;
+ eol = strchr(cur, '\n');
+ if ((eol) &&
+ ((processor->processor_type = strndup(cur, eol - cur))
+ == NULL))
+ goto no_memory;
+ virSkipSpaces(&(processor->processor_type));
+ }
+
+ if ((cur = strstr(base, "revision")) != NULL) {
+ cur = strchr(cur, ':') + 1;
+ eol = strchr(cur, '\n');
+ if ((eol) &&
+ ((processor->processor_version = strndup(cur, eol -
cur))
+ ==
NULL))
+ goto no_memory;
+ virSkipSpaces(&(processor->processor_version));
+ }
+
+ base = cur;
+ }
+
+ return 0;
+
+no_memory:
+ return -1;
+}
+
+/* virSysinfoRead for PowerPC
+ * Gathers sysinfo data from /proc/cpuinfo */
+virSysinfoDefPtr
+virSysinfoRead(void) {
+ virSysinfoDefPtr ret = NULL;
+ char *outbuf = NULL;
+
+ if (VIR_ALLOC(ret) < 0)
+ goto no_memory;
+
+ if(virFileReadAll(CPUINFO, 2048, &outbuf) < 0) {
+ virSmbiosReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Failed to open %s"), CPUINFO);
+ return NULL;
+ }
+
+ ret->nprocessor = 0;
+ ret->processor = NULL;
+ if (virSysinfoParseProcessor(outbuf, ret) < 0)
+ goto no_memory;
+
+ if (virSysinfoParseSystem(outbuf, ret) < 0)
+ goto no_memory;
+
+ return ret;
+
+no_memory:
+ VIR_FREE(outbuf);
+ return NULL;
+}
+
+#elif defined(WIN32) || \
!(defined(__x86_64__) || \
defined(__i386__) || \
- defined(__amd64__))
+ defined(__amd64__) || \
+ defined(__powerpc__))
virSysinfoDefPtr
virSysinfoRead(void) {
/*
--
1.7.7
--
Prerna Saxena
Linux Technology Centre,
IBM Systems and Technology Lab,
Bangalore, India