External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement sysinfo on PowerPC.

Browse Source 
Libvirt on x86 parses 'dmidecode' to gather characteristics of host
system. On PowerPC, this is now implemented by reading /proc/cpuinfo
NOTE: memory-DIMM information is not presently implemented.

Acked-by: Daniel Veillard <veillard@redhat.com>
Acked-by: Daniel P Berrange <berrange@redhat.com>
Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
This commit is contained in:
Prerna Saxena 2012-03-15 16:05:26 +05:30 committed by Daniel Veillard
parent 4445e16bfa
commit 25d3a2e01f
1 changed files with 131 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/util/sysinfo.c
View File

@ -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,138 @@ 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 *eol = NULL;
const char *cur;
if ((cur = strstr(base, "platform")) == NULL)
return 0;
base = cur;
/* Account for format 'platform : XXXX'*/
cur = strchr(cur, ':') + 1;
eol = strchr(cur, '\n');
virSkipSpaces(&cur);
if (eol &&
((ret->system_family = strndup(cur, eol - cur)) == NULL))
goto no_memory;
if ((cur = strstr(base, "model")) != NULL) {
cur = strchr(cur, ':') + 1;
eol = strchr(cur, '\n');
virSkipSpaces(&cur);
if (eol && ((ret->system_serial = strndup(cur, eol - cur))
== NULL))
goto no_memory;
}
if ((cur = strstr(base, "machine")) != NULL) {
cur = strchr(cur, ':') + 1;
eol = strchr(cur, '\n');
virSkipSpaces(&cur);
if (eol && ((ret->system_version = strndup(cur, eol - cur))
== NULL))
goto no_memory;
}
return 0;
no_memory:
return -1;
}
static int
virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret)
{
const char *cur;
char *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];
virSkipSpaces(&cur);
if (eol &&
((processor->processor_socket_destination = strndup
(cur, eol - cur)) == NULL))
goto no_memory;
if ((cur = strstr(base, "cpu")) != NULL) {
cur = strchr(cur, ':') + 1;
eol = strchr(cur, '\n');
virSkipSpaces(&cur);
if (eol &&
((processor->processor_type = strndup(cur, eol - cur))
== NULL))
goto no_memory;
}
if ((cur = strstr(base, "revision")) != NULL) {
cur = strchr(cur, ':') + 1;
eol = strchr(cur, '\n');
virSkipSpaces(&cur);
if (eol &&
((processor->processor_version = strndup(cur, eol - cur))
== NULL))
goto no_memory;
}
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) {
/*