[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 21/28] Rename sysinfo.{c,h} to virsysinfo.{c,h}



From: "Daniel P. Berrange" <berrange redhat com>

---
 po/POTFILES.in         |    2 +-
 src/Makefile.am        |    2 +-
 src/conf/domain_conf.h |    2 +-
 src/qemu/qemu_driver.c |    2 +-
 src/util/sysinfo.c     | 1045 ------------------------------------------------
 src/util/sysinfo.h     |  105 -----
 src/util/virsysinfo.c  | 1045 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/util/virsysinfo.h  |  105 +++++
 8 files changed, 1154 insertions(+), 1154 deletions(-)
 delete mode 100644 src/util/sysinfo.c
 delete mode 100644 src/util/sysinfo.h
 create mode 100644 src/util/virsysinfo.c
 create mode 100644 src/util/virsysinfo.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 417f128..c17c63c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -138,7 +138,6 @@ src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
 src/util/iohelper.c
-src/util/sysinfo.c
 src/util/util.c
 src/util/viraudit.c
 src/util/virauth.c
@@ -174,6 +173,7 @@ src/util/virsexpr.c
 src/util/virsocketaddr.c
 src/util/virstatslinux.c
 src/util/virstoragefile.c
+src/util/virsysinfo.c
 src/util/virterror.c
 src/util/virterror_internal.h
 src/util/virtime.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 911c041..376c543 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/sysinfo.c util/sysinfo.h			\
 		util/threads.c util/threads.h			\
 		util/threads-pthread.h				\
 		util/threads-win32.h				\
@@ -86,6 +85,7 @@ UTIL_SOURCES =							\
 		util/virsexpr.c util/virsexpr.h			\
 		util/virstatslinux.c util/virstatslinux.h	\
 		util/virstoragefile.c util/virstoragefile.h	\
+		util/virsysinfo.c util/virsysinfo.h		\
 		util/virtypedparam.c util/virtypedparam.h	\
 		util/xml.c util/xml.h				\
 		util/virterror.c util/virterror_internal.h	\
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 6bac92f..718c6a9 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -39,7 +39,7 @@
 # include "nwfilter_params.h"
 # include "nwfilter_conf.h"
 # include "virnetdevmacvlan.h"
-# include "sysinfo.h"
+# include "virsysinfo.h"
 # include "virnetdevvportprofile.h"
 # include "virnetdevopenvswitch.h"
 # include "virnetdevbandwidth.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fd36dfc..0038d95 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -78,7 +78,7 @@
 #include "libvirt_internal.h"
 #include "xml.h"
 #include "cpu/cpu.h"
-#include "sysinfo.h"
+#include "virsysinfo.h"
 #include "domain_nwfilter.h"
 #include "virhooks.h"
 #include "virstoragefile.h"
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
deleted file mode 100644
index 667e6a2..0000000
--- a/src/util/sysinfo.c
+++ /dev/null
@@ -1,1045 +0,0 @@
-/*
- * sysinfo.c: get SMBIOS/sysinfo information from the host
- *
- * Copyright (C) 2010-2012 Red Hat, Inc.
- * Copyright (C) 2010 Daniel Veillard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard redhat com>
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "virterror_internal.h"
-#include "sysinfo.h"
-#include "util.h"
-#include "virlog.h"
-#include "viralloc.h"
-#include "vircommand.h"
-
-#define VIR_FROM_THIS VIR_FROM_SYSINFO
-
-#define SYSINFO_SMBIOS_DECODER "dmidecode"
-#define SYSINFO "/proc/sysinfo"
-#define CPUINFO "/proc/cpuinfo"
-
-VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST,
-              "smbios");
-
-/**
- * virSysinfoDefFree:
- * @def: a sysinfo structure
- *
- * Free up the sysinfo structure
- */
-
-void virSysinfoDefFree(virSysinfoDefPtr def)
-{
-    int i;
-
-    if (def == NULL)
-        return;
-
-    VIR_FREE(def->bios_vendor);
-    VIR_FREE(def->bios_version);
-    VIR_FREE(def->bios_date);
-    VIR_FREE(def->bios_release);
-
-    VIR_FREE(def->system_manufacturer);
-    VIR_FREE(def->system_product);
-    VIR_FREE(def->system_version);
-    VIR_FREE(def->system_serial);
-    VIR_FREE(def->system_uuid);
-    VIR_FREE(def->system_sku);
-    VIR_FREE(def->system_family);
-
-    for (i = 0;i < def->nprocessor;i++) {
-        VIR_FREE(def->processor[i].processor_socket_destination);
-        VIR_FREE(def->processor[i].processor_type);
-        VIR_FREE(def->processor[i].processor_family);
-        VIR_FREE(def->processor[i].processor_manufacturer);
-        VIR_FREE(def->processor[i].processor_signature);
-        VIR_FREE(def->processor[i].processor_version);
-        VIR_FREE(def->processor[i].processor_external_clock);
-        VIR_FREE(def->processor[i].processor_max_speed);
-        VIR_FREE(def->processor[i].processor_status);
-        VIR_FREE(def->processor[i].processor_serial_number);
-        VIR_FREE(def->processor[i].processor_part_number);
-    }
-    VIR_FREE(def->processor);
-    for (i = 0;i < def->nmemory;i++) {
-        VIR_FREE(def->memory[i].memory_size);
-        VIR_FREE(def->memory[i].memory_form_factor);
-        VIR_FREE(def->memory[i].memory_locator);
-        VIR_FREE(def->memory[i].memory_bank_locator);
-        VIR_FREE(def->memory[i].memory_type);
-        VIR_FREE(def->memory[i].memory_type_detail);
-        VIR_FREE(def->memory[i].memory_speed);
-        VIR_FREE(def->memory[i].memory_manufacturer);
-        VIR_FREE(def->memory[i].memory_serial_number);
-        VIR_FREE(def->memory[i].memory_part_number);
-    }
-    VIR_FREE(def->memory);
-
-    VIR_FREE(def);
-}
-
-/**
- * virSysinfoRead:
- *
- * Tries to read the SMBIOS information from the current host
- *
- * Returns: a filled up sysinfo structure or NULL in case of error
- */
-
-#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) {
-        virReportError(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(__s390__) || defined(__s390x__)
-
-static int
-virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret)
-{
-    char *cur, *eol = NULL;
-    const char *property;
-
-    /* Return if Manufacturer field is not found */
-    if ((cur = strstr(base, "Manufacturer")) == NULL)
-        return 0;
-
-    base = cur;
-    if ((cur = strstr(base, "Manufacturer")) != NULL) {
-        cur = strchr(cur, ':') + 1;
-        eol = strchr(cur, '\n');
-        virSkipSpacesBackwards(cur, &eol);
-        if ((eol) && ((property = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-        virSkipSpaces(&property);
-        ret->system_manufacturer = (char *) property;
-    }
-    if ((cur = strstr(base, "Type")) != NULL) {
-        cur = strchr(cur, ':') + 1;
-        eol = strchr(cur, '\n');
-        virSkipSpacesBackwards(cur, &eol);
-        if ((eol) && ((property = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-        virSkipSpaces(&property);
-        ret->system_family = (char *) property;
-    }
-    if ((cur = strstr(base, "Sequence Code")) != NULL) {
-        cur = strchr(cur, ':') + 1;
-        eol = strchr(cur, '\n');
-        virSkipSpacesBackwards(cur, &eol);
-        if ((eol) && ((property = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-        virSkipSpaces(&property);
-        ret->system_serial = (char *) property;
-    }
-
-    return 0;
-
-no_memory:
-    return -1;
-}
-
-static int
-virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret)
-{
-    char *cur, *eol, *tmp_base;
-    char *manufacturer;
-    const char *tmp;
-    virSysinfoProcessorDefPtr processor;
-
-    if ((cur = strstr(base, "vendor_id")) != NULL) {
-        cur = strchr(cur, ':') + 1;
-        eol = strchr(cur, '\n');
-        virSkipSpacesBackwards(cur, &eol);
-        if ((eol) && ((tmp = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-        virSkipSpaces(&tmp);
-        manufacturer = (char *) tmp;
-    }
-
-    /* Find processor N: line and gather the processor manufacturer, version,
-     * serial number, and family */
-    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];
-
-        /* Set the processor manufacturer */
-        processor->processor_manufacturer = manufacturer;
-
-        if ((cur = strstr(base, "version =")) != NULL) {
-            cur += sizeof("version =");
-            eol = strchr(cur, ',');
-            if ((eol) &&
-                ((processor->processor_version = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "identification =")) != NULL) {
-            cur += sizeof("identification =");
-            eol = strchr(cur, ',');
-            if ((eol) &&
-                ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "machine =")) != NULL) {
-            cur += sizeof("machine =");
-            eol = strchr(cur, '\n');
-            if ((eol) &&
-                ((processor->processor_family = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-
-        base = cur;
-    }
-
-    return 0;
-
-no_memory:
-    return -1;
-}
-
-/* virSysinfoRead for s390x
- * Gathers sysinfo data from /proc/sysinfo and /proc/cpuinfo */
-virSysinfoDefPtr
-virSysinfoRead(void) {
-    virSysinfoDefPtr ret = NULL;
-    char *outbuf = NULL;
-
-    if (VIR_ALLOC(ret) < 0)
-        goto no_memory;
-
-    /* Gather info from /proc/cpuinfo */
-    if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) {
-        virReportError(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;
-
-    /* Free buffer before reading next file */
-    VIR_FREE(outbuf);
-
-    /* Gather info from /proc/sysinfo */
-    if (virFileReadAll(SYSINFO, 8192, &outbuf) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Failed to open %s"), SYSINFO);
-        return NULL;
-    }
-
-    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(__powerpc__))
-virSysinfoDefPtr
-virSysinfoRead(void) {
-    /*
-     * this can probably be extracted from Windows using API or registry
-     * http://www.microsoft.com/whdc/system/platform/firmware/SMBIOS.mspx
-     */
-    virReportSystemError(ENOSYS, "%s",
-                         _("Host sysinfo extraction not supported on this platform"));
-    return NULL;
-}
-
-#else /* !WIN32 && x86 */
-
-static int
-virSysinfoParseBIOS(const char *base, virSysinfoDefPtr ret)
-{
-    const char *cur, *eol = NULL;
-
-    if ((cur = strstr(base, "BIOS Information")) == NULL)
-        return 0;
-
-    base = cur;
-    if ((cur = strstr(base, "Vendor: ")) != NULL) {
-        cur += 8;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->bios_vendor = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "Version: ")) != NULL) {
-        cur += 9;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->bios_version = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "Release Date: ")) != NULL) {
-        cur += 14;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->bios_date = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "BIOS Revision: ")) != NULL) {
-        cur += 15;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->bios_release = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-
-    return 0;
-
-no_memory:
-    return -1;
-}
-
-static int
-virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret)
-{
-    const char *cur, *eol = NULL;
-
-    if ((cur = strstr(base, "System Information")) == NULL)
-        return 0;
-
-    base = cur;
-    if ((cur = strstr(base, "Manufacturer: ")) != NULL) {
-        cur += 14;
-        eol = strchr(cur, '\n');
-        if ((eol) &&
-            ((ret->system_manufacturer = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "Product Name: ")) != NULL) {
-        cur += 14;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->system_product = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "Version: ")) != NULL) {
-        cur += 9;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->system_version = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "Serial Number: ")) != NULL) {
-        cur += 15;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->system_serial = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "UUID: ")) != NULL) {
-        cur += 6;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->system_uuid = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "SKU Number: ")) != NULL) {
-        cur += 12;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->system_sku = strndup(cur, eol - cur)) == NULL))
-            goto no_memory;
-    }
-    if ((cur = strstr(base, "Family: ")) != NULL) {
-        cur += 8;
-        eol = strchr(cur, '\n');
-        if ((eol) && ((ret->system_family = 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, *tmp_base;
-    char *eol;
-    virSysinfoProcessorDefPtr processor;
-
-    while ((tmp_base = strstr(base, "Processor Information")) != NULL) {
-        base = tmp_base;
-        eol = NULL;
-
-        if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) {
-            goto no_memory;
-        }
-        processor = &ret->processor[ret->nprocessor - 1];
-
-        if ((cur = strstr(base, "Socket Designation: ")) != NULL) {
-            cur += 20;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_socket_destination
-                  = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Type: ")) != NULL) {
-            cur += 6;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_type = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Family: ")) != NULL) {
-            cur += 8;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_family = strndup(cur,
-                                                        eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Manufacturer: ")) != NULL) {
-            cur += 14;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_manufacturer
-                  = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Signature: ")) != NULL) {
-            cur += 11;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_signature
-                  = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Version: ")) != NULL) {
-            cur += 9;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_version = strndup(cur,
-                                                         eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "External Clock: ")) != NULL) {
-            cur += 16;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_external_clock
-                  = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Max Speed: ")) != NULL) {
-            cur += 11;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_max_speed
-                  = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Status: ")) != NULL) {
-            cur += 8;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_status = strndup(cur,
-                                                        eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Serial Number: ")) != NULL) {
-            cur += 15;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_serial_number
-                  = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Part Number: ")) != NULL) {
-            cur += 13;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((processor->processor_part_number
-                  = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-
-        base += strlen("Processor Information");
-    }
-
-    return 0;
-
-no_memory:
-    return -1;
-}
-
-static int
-virSysinfoParseMemory(const char *base, virSysinfoDefPtr ret)
-{
-    const char *cur, *tmp_base;
-    char *eol;
-    virSysinfoMemoryDefPtr memory;
-
-    while ((tmp_base = strstr(base, "Memory Device")) != NULL) {
-        base = tmp_base;
-        eol = NULL;
-
-        if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) {
-            goto no_memory;
-        }
-        memory = &ret->memory[ret->nmemory - 1];
-
-        if ((cur = strstr(base, "Size: ")) != NULL) {
-            cur += 6;
-            eol = strchr(cur, '\n');
-            if (STREQLEN(cur, "No Module Installed", eol - cur))
-                goto next;
-
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_size = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Form Factor: ")) != NULL) {
-            cur += 13;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_form_factor = strndup(cur,
-                                                       eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Locator: ")) != NULL) {
-            cur += 9;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_locator = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Bank Locator: ")) != NULL) {
-            cur += 14;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_bank_locator = strndup(cur,
-                                                        eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Type: ")) != NULL) {
-            cur += 6;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_type = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Type Detail: ")) != NULL) {
-            cur += 13;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_type_detail = strndup(cur,
-                                                       eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Speed: ")) != NULL) {
-            cur += 7;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_speed = strndup(cur, eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Manufacturer: ")) != NULL) {
-            cur += 14;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_manufacturer = strndup(cur,
-                                                        eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Serial Number: ")) != NULL) {
-            cur += 15;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_serial_number = strndup(cur,
-                                                         eol - cur)) == NULL))
-                goto no_memory;
-        }
-        if ((cur = strstr(base, "Part Number: ")) != NULL) {
-            cur += 13;
-            eol = strchr(cur, '\n');
-            virSkipSpacesBackwards(cur, &eol);
-            if ((eol) &&
-                ((memory->memory_part_number = strndup(cur,
-                                                       eol - cur)) == NULL))
-                goto no_memory;
-        }
-
-    next:
-        base += strlen("Memory Device");
-    }
-
-    return 0;
-
-no_memory:
-    return -1;
-}
-
-virSysinfoDefPtr
-virSysinfoRead(void) {
-    char *path;
-    virSysinfoDefPtr ret = NULL;
-    char *outbuf = NULL;
-    virCommandPtr cmd;
-
-    path = virFindFileInPath(SYSINFO_SMBIOS_DECODER);
-    if (path == NULL) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Failed to find path for %s binary"),
-                       SYSINFO_SMBIOS_DECODER);
-        return NULL;
-    }
-
-    cmd = virCommandNewArgList(path, "-q", "-t", "0,1,4,17", NULL);
-    VIR_FREE(path);
-    virCommandSetOutputBuffer(cmd, &outbuf);
-    if (virCommandRun(cmd, NULL) < 0)
-        goto cleanup;
-
-    if (VIR_ALLOC(ret) < 0)
-        goto no_memory;
-
-    ret->type = VIR_SYSINFO_SMBIOS;
-
-    if (virSysinfoParseBIOS(outbuf, ret) < 0)
-        goto no_memory;
-
-    if (virSysinfoParseSystem(outbuf, ret) < 0)
-        goto no_memory;
-
-    ret->nprocessor = 0;
-    ret->processor = NULL;
-    if (virSysinfoParseProcessor(outbuf, ret) < 0)
-        goto no_memory;
-
-    ret->nmemory = 0;
-    ret->memory = NULL;
-    if (virSysinfoParseMemory(outbuf, ret) < 0)
-        goto no_memory;
-
-cleanup:
-    VIR_FREE(outbuf);
-    virCommandFree(cmd);
-
-    return ret;
-
-no_memory:
-    virReportOOMError();
-
-    virSysinfoDefFree(ret);
-    ret = NULL;
-    goto cleanup;
-}
-#endif /* !WIN32 && x86 */
-
-static void
-virSysinfoBIOSFormat(virBufferPtr buf, virSysinfoDefPtr def)
-{
-    if (!def->bios_vendor && !def->bios_version &&
-        !def->bios_date && !def->bios_release)
-        return;
-
-    virBufferAddLit(buf, "  <bios>\n");
-    virBufferEscapeString(buf, "    <entry name='vendor'>%s</entry>\n",
-                          def->bios_vendor);
-    virBufferEscapeString(buf, "    <entry name='version'>%s</entry>\n",
-                          def->bios_version);
-    virBufferEscapeString(buf, "    <entry name='date'>%s</entry>\n",
-                          def->bios_date);
-    virBufferEscapeString(buf, "    <entry name='release'>%s</entry>\n",
-                          def->bios_release);
-    virBufferAddLit(buf, "  </bios>\n");
-}
-
-static void
-virSysinfoSystemFormat(virBufferPtr buf, virSysinfoDefPtr def)
-{
-    if (!def->system_manufacturer && !def->system_product &&
-        !def->system_version && !def->system_serial &&
-        !def->system_uuid && !def->system_sku && !def->system_family)
-        return;
-
-    virBufferAddLit(buf, "  <system>\n");
-    virBufferEscapeString(buf, "    <entry name='manufacturer'>%s</entry>\n",
-                          def->system_manufacturer);
-    virBufferEscapeString(buf, "    <entry name='product'>%s</entry>\n",
-                          def->system_product);
-    virBufferEscapeString(buf, "    <entry name='version'>%s</entry>\n",
-                          def->system_version);
-    virBufferEscapeString(buf, "    <entry name='serial'>%s</entry>\n",
-                          def->system_serial);
-    virBufferEscapeString(buf, "    <entry name='uuid'>%s</entry>\n",
-                          def->system_uuid);
-    virBufferEscapeString(buf, "    <entry name='sku'>%s</entry>\n",
-                          def->system_sku);
-    virBufferEscapeString(buf, "    <entry name='family'>%s</entry>\n",
-                          def->system_family);
-    virBufferAddLit(buf, "  </system>\n");
-}
-
-static void
-virSysinfoProcessorFormat(virBufferPtr buf, virSysinfoDefPtr def)
-{
-    int i;
-    virSysinfoProcessorDefPtr processor;
-
-    for (i = 0; i < def->nprocessor; i++) {
-        processor = &def->processor[i];
-
-        if (!processor->processor_socket_destination &&
-            !processor->processor_type &&
-            !processor->processor_family &&
-            !processor->processor_manufacturer &&
-            !processor->processor_signature &&
-            !processor->processor_version &&
-            !processor->processor_external_clock &&
-            !processor->processor_max_speed &&
-            !processor->processor_status &&
-            !processor->processor_serial_number &&
-            !processor->processor_part_number)
-            continue;
-
-        virBufferAddLit(buf, "  <processor>\n");
-        virBufferAdjustIndent(buf, 4);
-        virBufferEscapeString(buf,
-                              "<entry name='socket_destination'>%s</entry>\n",
-                              processor->processor_socket_destination);
-        virBufferEscapeString(buf, "<entry name='type'>%s</entry>\n",
-                              processor->processor_type);
-        virBufferEscapeString(buf, "<entry name='family'>%s</entry>\n",
-                              processor->processor_family);
-        virBufferEscapeString(buf, "<entry name='manufacturer'>%s</entry>\n",
-                              processor->processor_manufacturer);
-        virBufferEscapeString(buf, "<entry name='signature'>%s</entry>\n",
-                              processor->processor_signature);
-        virBufferEscapeString(buf, "<entry name='version'>%s</entry>\n",
-                              processor->processor_version);
-        virBufferEscapeString(buf, "<entry name='external_clock'>%s</entry>\n",
-                              processor->processor_external_clock);
-        virBufferEscapeString(buf, "<entry name='max_speed'>%s</entry>\n",
-                              processor->processor_max_speed);
-        virBufferEscapeString(buf, "<entry name='status'>%s</entry>\n",
-                              processor->processor_status);
-        virBufferEscapeString(buf, "<entry name='serial_number'>%s</entry>\n",
-                              processor->processor_serial_number);
-        virBufferEscapeString(buf, "<entry name='part_number'>%s</entry>\n",
-                              processor->processor_part_number);
-        virBufferAdjustIndent(buf, -4);
-        virBufferAddLit(buf, "  </processor>\n");
-    }
-}
-
-static void
-virSysinfoMemoryFormat(virBufferPtr buf, virSysinfoDefPtr def)
-{
-    int i;
-    virSysinfoMemoryDefPtr memory;
-
-    for (i = 0; i < def->nmemory; i++) {
-        memory = &def->memory[i];
-
-        if (!memory->memory_size &&
-            !memory->memory_form_factor &&
-            !memory->memory_locator &&
-            !memory->memory_bank_locator &&
-            !memory->memory_type &&
-            !memory->memory_type_detail &&
-            !memory->memory_speed &&
-            !memory->memory_manufacturer &&
-            !memory->memory_serial_number &&
-            !memory->memory_part_number)
-            continue;
-
-        virBufferAddLit(buf, "  <memory_device>\n");
-        virBufferEscapeString(buf, "    <entry name='size'>%s</entry>\n",
-                              memory->memory_size);
-        virBufferEscapeString(buf,
-                              "    <entry name='form_factor'>%s</entry>\n",
-                              memory->memory_form_factor);
-        virBufferEscapeString(buf, "    <entry name='locator'>%s</entry>\n",
-                              memory->memory_locator);
-        virBufferEscapeString(buf,
-                              "    <entry name='bank_locator'>%s</entry>\n",
-                              memory->memory_bank_locator);
-        virBufferEscapeString(buf, "    <entry name='type'>%s</entry>\n",
-                              memory->memory_type);
-        virBufferEscapeString(buf,
-                              "    <entry name='type_detail'>%s</entry>\n",
-                              memory->memory_type_detail);
-        virBufferEscapeString(buf, "    <entry name='speed'>%s</entry>\n",
-                              memory->memory_speed);
-        virBufferEscapeString(buf,
-                              "    <entry name='manufacturer'>%s</entry>\n",
-                              memory->memory_manufacturer);
-        virBufferEscapeString(buf,
-                              "    <entry name='serial_number'>%s</entry>\n",
-                              memory->memory_serial_number);
-        virBufferEscapeString(buf,
-                              "    <entry name='part_number'>%s</entry>\n",
-                              memory->memory_part_number);
-        virBufferAddLit(buf, "  </memory_device>\n");
-    }
-}
-
-/**
- * virSysinfoFormat:
- * @buf: buffer to append output to (may use auto-indentation)
- * @def: structure to convert to xml string
- *
- * Returns 0 on success, -1 on failure after generating an error message.
- */
-int
-virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def)
-{
-    const char *type = virSysinfoTypeToString(def->type);
-
-    if (!type) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unexpected sysinfo type model %d"),
-                       def->type);
-        virBufferFreeAndReset(buf);
-        return -1;
-    }
-
-    virBufferAsprintf(buf, "<sysinfo type='%s'>\n", type);
-
-    virSysinfoBIOSFormat(buf, def);
-    virSysinfoSystemFormat(buf, def);
-    virSysinfoProcessorFormat(buf, def);
-    virSysinfoMemoryFormat(buf, def);
-
-    virBufferAddLit(buf, "</sysinfo>\n");
-
-    if (virBufferError(buf)) {
-        virReportOOMError();
-        return -1;
-    }
-
-    return 0;
-}
-
-bool virSysinfoIsEqual(virSysinfoDefPtr src,
-                       virSysinfoDefPtr dst)
-{
-    bool identical = false;
-
-    if (!src && !dst)
-        return true;
-
-    if ((src && !dst) || (!src && dst)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("Target sysinfo does not match source"));
-        goto cleanup;
-    }
-
-    if (src->type != dst->type) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("Target sysinfo %s does not match source %s"),
-                       virSysinfoTypeToString(dst->type),
-                       virSysinfoTypeToString(src->type));
-        goto cleanup;
-    }
-
-#define CHECK_FIELD(name, desc)                                         \
-    do {                                                                \
-        if (STRNEQ_NULLABLE(src->name, dst->name)) {                    \
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,                  \
-                           _("Target sysinfo %s %s does not match source %s"), \
-                           desc, NULLSTR(src->name), NULLSTR(dst->name)); \
-        }                                                               \
-    } while (0)
-
-    CHECK_FIELD(bios_vendor, "BIOS vendor");
-    CHECK_FIELD(bios_version, "BIOS version");
-    CHECK_FIELD(bios_date, "BIOS date");
-    CHECK_FIELD(bios_release, "BIOS release");
-
-    CHECK_FIELD(system_manufacturer, "system vendor");
-    CHECK_FIELD(system_product, "system product");
-    CHECK_FIELD(system_version, "system version");
-    CHECK_FIELD(system_serial, "system serial");
-    CHECK_FIELD(system_uuid, "system uuid");
-    CHECK_FIELD(system_sku, "system sku");
-    CHECK_FIELD(system_family, "system family");
-
-#undef CHECK_FIELD
-
-    identical = true;
-
-cleanup:
-    return identical;
-}
diff --git a/src/util/sysinfo.h b/src/util/sysinfo.h
deleted file mode 100644
index 0b1f000..0000000
--- a/src/util/sysinfo.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * sysinfo.h: structure and entry points for sysinfo support
- *
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * Copyright (C) 2010 Daniel Veillard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard redhat com>
- */
-
-#ifndef __VIR_SYSINFOS_H__
-# define __VIR_SYSINFOS_H__
-
-# include "internal.h"
-# include "util.h"
-# include "virbuffer.h"
-
-enum virSysinfoType {
-    VIR_SYSINFO_SMBIOS,
-
-    VIR_SYSINFO_LAST
-};
-
-typedef struct _virSysinfoProcessorDef virSysinfoProcessorDef;
-typedef virSysinfoProcessorDef *virSysinfoProcessorDefPtr;
-struct _virSysinfoProcessorDef {
-    char *processor_socket_destination;
-    char *processor_type;
-    char *processor_family;
-    char *processor_manufacturer;
-    char *processor_signature;
-    char *processor_version;
-    char *processor_external_clock;
-    char *processor_max_speed;
-    char *processor_status;
-    char *processor_serial_number;
-    char *processor_part_number;
-};
-
-typedef struct _virSysinfoMemoryDef virSysinfoMemoryDef;
-typedef virSysinfoMemoryDef *virSysinfoMemoryDefPtr;
-struct _virSysinfoMemoryDef {
-    char *memory_size;
-    char *memory_form_factor;
-    char *memory_locator;
-    char *memory_bank_locator;
-    char *memory_type;
-    char *memory_type_detail;
-    char *memory_speed;
-    char *memory_manufacturer;
-    char *memory_serial_number;
-    char *memory_part_number;
-};
-
-typedef struct _virSysinfoDef virSysinfoDef;
-typedef virSysinfoDef *virSysinfoDefPtr;
-struct _virSysinfoDef {
-    int type;
-
-    char *bios_vendor;
-    char *bios_version;
-    char *bios_date;
-    char *bios_release;
-
-    char *system_manufacturer;
-    char *system_product;
-    char *system_version;
-    char *system_serial;
-    char *system_uuid;
-    char *system_sku;
-    char *system_family;
-
-    size_t nprocessor;
-    virSysinfoProcessorDefPtr processor;
-
-    size_t nmemory;
-    virSysinfoMemoryDefPtr memory;
-};
-
-virSysinfoDefPtr virSysinfoRead(void);
-
-void virSysinfoDefFree(virSysinfoDefPtr def);
-
-int virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
-bool virSysinfoIsEqual(virSysinfoDefPtr src,
-                       virSysinfoDefPtr dst);
-
-VIR_ENUM_DECL(virSysinfo)
-
-#endif /* __VIR_SYSINFOS_H__ */
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
new file mode 100644
index 0000000..13d3c22
--- /dev/null
+++ b/src/util/virsysinfo.c
@@ -0,0 +1,1045 @@
+/*
+ * sysinfo.c: get SMBIOS/sysinfo information from the host
+ *
+ * Copyright (C) 2010-2012 Red Hat, Inc.
+ * Copyright (C) 2010 Daniel Veillard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Author: Daniel Veillard <veillard redhat com>
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "virterror_internal.h"
+#include "virsysinfo.h"
+#include "util.h"
+#include "virlog.h"
+#include "viralloc.h"
+#include "vircommand.h"
+
+#define VIR_FROM_THIS VIR_FROM_SYSINFO
+
+#define SYSINFO_SMBIOS_DECODER "dmidecode"
+#define SYSINFO "/proc/sysinfo"
+#define CPUINFO "/proc/cpuinfo"
+
+VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST,
+              "smbios");
+
+/**
+ * virSysinfoDefFree:
+ * @def: a sysinfo structure
+ *
+ * Free up the sysinfo structure
+ */
+
+void virSysinfoDefFree(virSysinfoDefPtr def)
+{
+    int i;
+
+    if (def == NULL)
+        return;
+
+    VIR_FREE(def->bios_vendor);
+    VIR_FREE(def->bios_version);
+    VIR_FREE(def->bios_date);
+    VIR_FREE(def->bios_release);
+
+    VIR_FREE(def->system_manufacturer);
+    VIR_FREE(def->system_product);
+    VIR_FREE(def->system_version);
+    VIR_FREE(def->system_serial);
+    VIR_FREE(def->system_uuid);
+    VIR_FREE(def->system_sku);
+    VIR_FREE(def->system_family);
+
+    for (i = 0;i < def->nprocessor;i++) {
+        VIR_FREE(def->processor[i].processor_socket_destination);
+        VIR_FREE(def->processor[i].processor_type);
+        VIR_FREE(def->processor[i].processor_family);
+        VIR_FREE(def->processor[i].processor_manufacturer);
+        VIR_FREE(def->processor[i].processor_signature);
+        VIR_FREE(def->processor[i].processor_version);
+        VIR_FREE(def->processor[i].processor_external_clock);
+        VIR_FREE(def->processor[i].processor_max_speed);
+        VIR_FREE(def->processor[i].processor_status);
+        VIR_FREE(def->processor[i].processor_serial_number);
+        VIR_FREE(def->processor[i].processor_part_number);
+    }
+    VIR_FREE(def->processor);
+    for (i = 0;i < def->nmemory;i++) {
+        VIR_FREE(def->memory[i].memory_size);
+        VIR_FREE(def->memory[i].memory_form_factor);
+        VIR_FREE(def->memory[i].memory_locator);
+        VIR_FREE(def->memory[i].memory_bank_locator);
+        VIR_FREE(def->memory[i].memory_type);
+        VIR_FREE(def->memory[i].memory_type_detail);
+        VIR_FREE(def->memory[i].memory_speed);
+        VIR_FREE(def->memory[i].memory_manufacturer);
+        VIR_FREE(def->memory[i].memory_serial_number);
+        VIR_FREE(def->memory[i].memory_part_number);
+    }
+    VIR_FREE(def->memory);
+
+    VIR_FREE(def);
+}
+
+/**
+ * virSysinfoRead:
+ *
+ * Tries to read the SMBIOS information from the current host
+ *
+ * Returns: a filled up sysinfo structure or NULL in case of error
+ */
+
+#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) {
+        virReportError(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(__s390__) || defined(__s390x__)
+
+static int
+virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret)
+{
+    char *cur, *eol = NULL;
+    const char *property;
+
+    /* Return if Manufacturer field is not found */
+    if ((cur = strstr(base, "Manufacturer")) == NULL)
+        return 0;
+
+    base = cur;
+    if ((cur = strstr(base, "Manufacturer")) != NULL) {
+        cur = strchr(cur, ':') + 1;
+        eol = strchr(cur, '\n');
+        virSkipSpacesBackwards(cur, &eol);
+        if ((eol) && ((property = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+        virSkipSpaces(&property);
+        ret->system_manufacturer = (char *) property;
+    }
+    if ((cur = strstr(base, "Type")) != NULL) {
+        cur = strchr(cur, ':') + 1;
+        eol = strchr(cur, '\n');
+        virSkipSpacesBackwards(cur, &eol);
+        if ((eol) && ((property = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+        virSkipSpaces(&property);
+        ret->system_family = (char *) property;
+    }
+    if ((cur = strstr(base, "Sequence Code")) != NULL) {
+        cur = strchr(cur, ':') + 1;
+        eol = strchr(cur, '\n');
+        virSkipSpacesBackwards(cur, &eol);
+        if ((eol) && ((property = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+        virSkipSpaces(&property);
+        ret->system_serial = (char *) property;
+    }
+
+    return 0;
+
+no_memory:
+    return -1;
+}
+
+static int
+virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret)
+{
+    char *cur, *eol, *tmp_base;
+    char *manufacturer;
+    const char *tmp;
+    virSysinfoProcessorDefPtr processor;
+
+    if ((cur = strstr(base, "vendor_id")) != NULL) {
+        cur = strchr(cur, ':') + 1;
+        eol = strchr(cur, '\n');
+        virSkipSpacesBackwards(cur, &eol);
+        if ((eol) && ((tmp = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+        virSkipSpaces(&tmp);
+        manufacturer = (char *) tmp;
+    }
+
+    /* Find processor N: line and gather the processor manufacturer, version,
+     * serial number, and family */
+    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];
+
+        /* Set the processor manufacturer */
+        processor->processor_manufacturer = manufacturer;
+
+        if ((cur = strstr(base, "version =")) != NULL) {
+            cur += sizeof("version =");
+            eol = strchr(cur, ',');
+            if ((eol) &&
+                ((processor->processor_version = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "identification =")) != NULL) {
+            cur += sizeof("identification =");
+            eol = strchr(cur, ',');
+            if ((eol) &&
+                ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "machine =")) != NULL) {
+            cur += sizeof("machine =");
+            eol = strchr(cur, '\n');
+            if ((eol) &&
+                ((processor->processor_family = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+
+        base = cur;
+    }
+
+    return 0;
+
+no_memory:
+    return -1;
+}
+
+/* virSysinfoRead for s390x
+ * Gathers sysinfo data from /proc/sysinfo and /proc/cpuinfo */
+virSysinfoDefPtr
+virSysinfoRead(void) {
+    virSysinfoDefPtr ret = NULL;
+    char *outbuf = NULL;
+
+    if (VIR_ALLOC(ret) < 0)
+        goto no_memory;
+
+    /* Gather info from /proc/cpuinfo */
+    if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) {
+        virReportError(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;
+
+    /* Free buffer before reading next file */
+    VIR_FREE(outbuf);
+
+    /* Gather info from /proc/sysinfo */
+    if (virFileReadAll(SYSINFO, 8192, &outbuf) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Failed to open %s"), SYSINFO);
+        return NULL;
+    }
+
+    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(__powerpc__))
+virSysinfoDefPtr
+virSysinfoRead(void) {
+    /*
+     * this can probably be extracted from Windows using API or registry
+     * http://www.microsoft.com/whdc/system/platform/firmware/SMBIOS.mspx
+     */
+    virReportSystemError(ENOSYS, "%s",
+                         _("Host sysinfo extraction not supported on this platform"));
+    return NULL;
+}
+
+#else /* !WIN32 && x86 */
+
+static int
+virSysinfoParseBIOS(const char *base, virSysinfoDefPtr ret)
+{
+    const char *cur, *eol = NULL;
+
+    if ((cur = strstr(base, "BIOS Information")) == NULL)
+        return 0;
+
+    base = cur;
+    if ((cur = strstr(base, "Vendor: ")) != NULL) {
+        cur += 8;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->bios_vendor = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "Version: ")) != NULL) {
+        cur += 9;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->bios_version = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "Release Date: ")) != NULL) {
+        cur += 14;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->bios_date = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "BIOS Revision: ")) != NULL) {
+        cur += 15;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->bios_release = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+
+    return 0;
+
+no_memory:
+    return -1;
+}
+
+static int
+virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret)
+{
+    const char *cur, *eol = NULL;
+
+    if ((cur = strstr(base, "System Information")) == NULL)
+        return 0;
+
+    base = cur;
+    if ((cur = strstr(base, "Manufacturer: ")) != NULL) {
+        cur += 14;
+        eol = strchr(cur, '\n');
+        if ((eol) &&
+            ((ret->system_manufacturer = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "Product Name: ")) != NULL) {
+        cur += 14;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->system_product = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "Version: ")) != NULL) {
+        cur += 9;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->system_version = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "Serial Number: ")) != NULL) {
+        cur += 15;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->system_serial = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "UUID: ")) != NULL) {
+        cur += 6;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->system_uuid = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "SKU Number: ")) != NULL) {
+        cur += 12;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->system_sku = strndup(cur, eol - cur)) == NULL))
+            goto no_memory;
+    }
+    if ((cur = strstr(base, "Family: ")) != NULL) {
+        cur += 8;
+        eol = strchr(cur, '\n');
+        if ((eol) && ((ret->system_family = 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, *tmp_base;
+    char *eol;
+    virSysinfoProcessorDefPtr processor;
+
+    while ((tmp_base = strstr(base, "Processor Information")) != NULL) {
+        base = tmp_base;
+        eol = NULL;
+
+        if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) {
+            goto no_memory;
+        }
+        processor = &ret->processor[ret->nprocessor - 1];
+
+        if ((cur = strstr(base, "Socket Designation: ")) != NULL) {
+            cur += 20;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_socket_destination
+                  = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Type: ")) != NULL) {
+            cur += 6;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_type = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Family: ")) != NULL) {
+            cur += 8;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_family = strndup(cur,
+                                                        eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Manufacturer: ")) != NULL) {
+            cur += 14;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_manufacturer
+                  = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Signature: ")) != NULL) {
+            cur += 11;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_signature
+                  = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Version: ")) != NULL) {
+            cur += 9;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_version = strndup(cur,
+                                                         eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "External Clock: ")) != NULL) {
+            cur += 16;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_external_clock
+                  = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Max Speed: ")) != NULL) {
+            cur += 11;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_max_speed
+                  = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Status: ")) != NULL) {
+            cur += 8;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_status = strndup(cur,
+                                                        eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Serial Number: ")) != NULL) {
+            cur += 15;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_serial_number
+                  = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Part Number: ")) != NULL) {
+            cur += 13;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((processor->processor_part_number
+                  = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+
+        base += strlen("Processor Information");
+    }
+
+    return 0;
+
+no_memory:
+    return -1;
+}
+
+static int
+virSysinfoParseMemory(const char *base, virSysinfoDefPtr ret)
+{
+    const char *cur, *tmp_base;
+    char *eol;
+    virSysinfoMemoryDefPtr memory;
+
+    while ((tmp_base = strstr(base, "Memory Device")) != NULL) {
+        base = tmp_base;
+        eol = NULL;
+
+        if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) {
+            goto no_memory;
+        }
+        memory = &ret->memory[ret->nmemory - 1];
+
+        if ((cur = strstr(base, "Size: ")) != NULL) {
+            cur += 6;
+            eol = strchr(cur, '\n');
+            if (STREQLEN(cur, "No Module Installed", eol - cur))
+                goto next;
+
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_size = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Form Factor: ")) != NULL) {
+            cur += 13;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_form_factor = strndup(cur,
+                                                       eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Locator: ")) != NULL) {
+            cur += 9;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_locator = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Bank Locator: ")) != NULL) {
+            cur += 14;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_bank_locator = strndup(cur,
+                                                        eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Type: ")) != NULL) {
+            cur += 6;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_type = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Type Detail: ")) != NULL) {
+            cur += 13;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_type_detail = strndup(cur,
+                                                       eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Speed: ")) != NULL) {
+            cur += 7;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_speed = strndup(cur, eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Manufacturer: ")) != NULL) {
+            cur += 14;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_manufacturer = strndup(cur,
+                                                        eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Serial Number: ")) != NULL) {
+            cur += 15;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_serial_number = strndup(cur,
+                                                         eol - cur)) == NULL))
+                goto no_memory;
+        }
+        if ((cur = strstr(base, "Part Number: ")) != NULL) {
+            cur += 13;
+            eol = strchr(cur, '\n');
+            virSkipSpacesBackwards(cur, &eol);
+            if ((eol) &&
+                ((memory->memory_part_number = strndup(cur,
+                                                       eol - cur)) == NULL))
+                goto no_memory;
+        }
+
+    next:
+        base += strlen("Memory Device");
+    }
+
+    return 0;
+
+no_memory:
+    return -1;
+}
+
+virSysinfoDefPtr
+virSysinfoRead(void) {
+    char *path;
+    virSysinfoDefPtr ret = NULL;
+    char *outbuf = NULL;
+    virCommandPtr cmd;
+
+    path = virFindFileInPath(SYSINFO_SMBIOS_DECODER);
+    if (path == NULL) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Failed to find path for %s binary"),
+                       SYSINFO_SMBIOS_DECODER);
+        return NULL;
+    }
+
+    cmd = virCommandNewArgList(path, "-q", "-t", "0,1,4,17", NULL);
+    VIR_FREE(path);
+    virCommandSetOutputBuffer(cmd, &outbuf);
+    if (virCommandRun(cmd, NULL) < 0)
+        goto cleanup;
+
+    if (VIR_ALLOC(ret) < 0)
+        goto no_memory;
+
+    ret->type = VIR_SYSINFO_SMBIOS;
+
+    if (virSysinfoParseBIOS(outbuf, ret) < 0)
+        goto no_memory;
+
+    if (virSysinfoParseSystem(outbuf, ret) < 0)
+        goto no_memory;
+
+    ret->nprocessor = 0;
+    ret->processor = NULL;
+    if (virSysinfoParseProcessor(outbuf, ret) < 0)
+        goto no_memory;
+
+    ret->nmemory = 0;
+    ret->memory = NULL;
+    if (virSysinfoParseMemory(outbuf, ret) < 0)
+        goto no_memory;
+
+cleanup:
+    VIR_FREE(outbuf);
+    virCommandFree(cmd);
+
+    return ret;
+
+no_memory:
+    virReportOOMError();
+
+    virSysinfoDefFree(ret);
+    ret = NULL;
+    goto cleanup;
+}
+#endif /* !WIN32 && x86 */
+
+static void
+virSysinfoBIOSFormat(virBufferPtr buf, virSysinfoDefPtr def)
+{
+    if (!def->bios_vendor && !def->bios_version &&
+        !def->bios_date && !def->bios_release)
+        return;
+
+    virBufferAddLit(buf, "  <bios>\n");
+    virBufferEscapeString(buf, "    <entry name='vendor'>%s</entry>\n",
+                          def->bios_vendor);
+    virBufferEscapeString(buf, "    <entry name='version'>%s</entry>\n",
+                          def->bios_version);
+    virBufferEscapeString(buf, "    <entry name='date'>%s</entry>\n",
+                          def->bios_date);
+    virBufferEscapeString(buf, "    <entry name='release'>%s</entry>\n",
+                          def->bios_release);
+    virBufferAddLit(buf, "  </bios>\n");
+}
+
+static void
+virSysinfoSystemFormat(virBufferPtr buf, virSysinfoDefPtr def)
+{
+    if (!def->system_manufacturer && !def->system_product &&
+        !def->system_version && !def->system_serial &&
+        !def->system_uuid && !def->system_sku && !def->system_family)
+        return;
+
+    virBufferAddLit(buf, "  <system>\n");
+    virBufferEscapeString(buf, "    <entry name='manufacturer'>%s</entry>\n",
+                          def->system_manufacturer);
+    virBufferEscapeString(buf, "    <entry name='product'>%s</entry>\n",
+                          def->system_product);
+    virBufferEscapeString(buf, "    <entry name='version'>%s</entry>\n",
+                          def->system_version);
+    virBufferEscapeString(buf, "    <entry name='serial'>%s</entry>\n",
+                          def->system_serial);
+    virBufferEscapeString(buf, "    <entry name='uuid'>%s</entry>\n",
+                          def->system_uuid);
+    virBufferEscapeString(buf, "    <entry name='sku'>%s</entry>\n",
+                          def->system_sku);
+    virBufferEscapeString(buf, "    <entry name='family'>%s</entry>\n",
+                          def->system_family);
+    virBufferAddLit(buf, "  </system>\n");
+}
+
+static void
+virSysinfoProcessorFormat(virBufferPtr buf, virSysinfoDefPtr def)
+{
+    int i;
+    virSysinfoProcessorDefPtr processor;
+
+    for (i = 0; i < def->nprocessor; i++) {
+        processor = &def->processor[i];
+
+        if (!processor->processor_socket_destination &&
+            !processor->processor_type &&
+            !processor->processor_family &&
+            !processor->processor_manufacturer &&
+            !processor->processor_signature &&
+            !processor->processor_version &&
+            !processor->processor_external_clock &&
+            !processor->processor_max_speed &&
+            !processor->processor_status &&
+            !processor->processor_serial_number &&
+            !processor->processor_part_number)
+            continue;
+
+        virBufferAddLit(buf, "  <processor>\n");
+        virBufferAdjustIndent(buf, 4);
+        virBufferEscapeString(buf,
+                              "<entry name='socket_destination'>%s</entry>\n",
+                              processor->processor_socket_destination);
+        virBufferEscapeString(buf, "<entry name='type'>%s</entry>\n",
+                              processor->processor_type);
+        virBufferEscapeString(buf, "<entry name='family'>%s</entry>\n",
+                              processor->processor_family);
+        virBufferEscapeString(buf, "<entry name='manufacturer'>%s</entry>\n",
+                              processor->processor_manufacturer);
+        virBufferEscapeString(buf, "<entry name='signature'>%s</entry>\n",
+                              processor->processor_signature);
+        virBufferEscapeString(buf, "<entry name='version'>%s</entry>\n",
+                              processor->processor_version);
+        virBufferEscapeString(buf, "<entry name='external_clock'>%s</entry>\n",
+                              processor->processor_external_clock);
+        virBufferEscapeString(buf, "<entry name='max_speed'>%s</entry>\n",
+                              processor->processor_max_speed);
+        virBufferEscapeString(buf, "<entry name='status'>%s</entry>\n",
+                              processor->processor_status);
+        virBufferEscapeString(buf, "<entry name='serial_number'>%s</entry>\n",
+                              processor->processor_serial_number);
+        virBufferEscapeString(buf, "<entry name='part_number'>%s</entry>\n",
+                              processor->processor_part_number);
+        virBufferAdjustIndent(buf, -4);
+        virBufferAddLit(buf, "  </processor>\n");
+    }
+}
+
+static void
+virSysinfoMemoryFormat(virBufferPtr buf, virSysinfoDefPtr def)
+{
+    int i;
+    virSysinfoMemoryDefPtr memory;
+
+    for (i = 0; i < def->nmemory; i++) {
+        memory = &def->memory[i];
+
+        if (!memory->memory_size &&
+            !memory->memory_form_factor &&
+            !memory->memory_locator &&
+            !memory->memory_bank_locator &&
+            !memory->memory_type &&
+            !memory->memory_type_detail &&
+            !memory->memory_speed &&
+            !memory->memory_manufacturer &&
+            !memory->memory_serial_number &&
+            !memory->memory_part_number)
+            continue;
+
+        virBufferAddLit(buf, "  <memory_device>\n");
+        virBufferEscapeString(buf, "    <entry name='size'>%s</entry>\n",
+                              memory->memory_size);
+        virBufferEscapeString(buf,
+                              "    <entry name='form_factor'>%s</entry>\n",
+                              memory->memory_form_factor);
+        virBufferEscapeString(buf, "    <entry name='locator'>%s</entry>\n",
+                              memory->memory_locator);
+        virBufferEscapeString(buf,
+                              "    <entry name='bank_locator'>%s</entry>\n",
+                              memory->memory_bank_locator);
+        virBufferEscapeString(buf, "    <entry name='type'>%s</entry>\n",
+                              memory->memory_type);
+        virBufferEscapeString(buf,
+                              "    <entry name='type_detail'>%s</entry>\n",
+                              memory->memory_type_detail);
+        virBufferEscapeString(buf, "    <entry name='speed'>%s</entry>\n",
+                              memory->memory_speed);
+        virBufferEscapeString(buf,
+                              "    <entry name='manufacturer'>%s</entry>\n",
+                              memory->memory_manufacturer);
+        virBufferEscapeString(buf,
+                              "    <entry name='serial_number'>%s</entry>\n",
+                              memory->memory_serial_number);
+        virBufferEscapeString(buf,
+                              "    <entry name='part_number'>%s</entry>\n",
+                              memory->memory_part_number);
+        virBufferAddLit(buf, "  </memory_device>\n");
+    }
+}
+
+/**
+ * virSysinfoFormat:
+ * @buf: buffer to append output to (may use auto-indentation)
+ * @def: structure to convert to xml string
+ *
+ * Returns 0 on success, -1 on failure after generating an error message.
+ */
+int
+virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def)
+{
+    const char *type = virSysinfoTypeToString(def->type);
+
+    if (!type) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("unexpected sysinfo type model %d"),
+                       def->type);
+        virBufferFreeAndReset(buf);
+        return -1;
+    }
+
+    virBufferAsprintf(buf, "<sysinfo type='%s'>\n", type);
+
+    virSysinfoBIOSFormat(buf, def);
+    virSysinfoSystemFormat(buf, def);
+    virSysinfoProcessorFormat(buf, def);
+    virSysinfoMemoryFormat(buf, def);
+
+    virBufferAddLit(buf, "</sysinfo>\n");
+
+    if (virBufferError(buf)) {
+        virReportOOMError();
+        return -1;
+    }
+
+    return 0;
+}
+
+bool virSysinfoIsEqual(virSysinfoDefPtr src,
+                       virSysinfoDefPtr dst)
+{
+    bool identical = false;
+
+    if (!src && !dst)
+        return true;
+
+    if ((src && !dst) || (!src && dst)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("Target sysinfo does not match source"));
+        goto cleanup;
+    }
+
+    if (src->type != dst->type) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("Target sysinfo %s does not match source %s"),
+                       virSysinfoTypeToString(dst->type),
+                       virSysinfoTypeToString(src->type));
+        goto cleanup;
+    }
+
+#define CHECK_FIELD(name, desc)                                         \
+    do {                                                                \
+        if (STRNEQ_NULLABLE(src->name, dst->name)) {                    \
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,                  \
+                           _("Target sysinfo %s %s does not match source %s"), \
+                           desc, NULLSTR(src->name), NULLSTR(dst->name)); \
+        }                                                               \
+    } while (0)
+
+    CHECK_FIELD(bios_vendor, "BIOS vendor");
+    CHECK_FIELD(bios_version, "BIOS version");
+    CHECK_FIELD(bios_date, "BIOS date");
+    CHECK_FIELD(bios_release, "BIOS release");
+
+    CHECK_FIELD(system_manufacturer, "system vendor");
+    CHECK_FIELD(system_product, "system product");
+    CHECK_FIELD(system_version, "system version");
+    CHECK_FIELD(system_serial, "system serial");
+    CHECK_FIELD(system_uuid, "system uuid");
+    CHECK_FIELD(system_sku, "system sku");
+    CHECK_FIELD(system_family, "system family");
+
+#undef CHECK_FIELD
+
+    identical = true;
+
+cleanup:
+    return identical;
+}
diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
new file mode 100644
index 0000000..0b1f000
--- /dev/null
+++ b/src/util/virsysinfo.h
@@ -0,0 +1,105 @@
+/*
+ * sysinfo.h: structure and entry points for sysinfo support
+ *
+ * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2010 Daniel Veillard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Author: Daniel Veillard <veillard redhat com>
+ */
+
+#ifndef __VIR_SYSINFOS_H__
+# define __VIR_SYSINFOS_H__
+
+# include "internal.h"
+# include "util.h"
+# include "virbuffer.h"
+
+enum virSysinfoType {
+    VIR_SYSINFO_SMBIOS,
+
+    VIR_SYSINFO_LAST
+};
+
+typedef struct _virSysinfoProcessorDef virSysinfoProcessorDef;
+typedef virSysinfoProcessorDef *virSysinfoProcessorDefPtr;
+struct _virSysinfoProcessorDef {
+    char *processor_socket_destination;
+    char *processor_type;
+    char *processor_family;
+    char *processor_manufacturer;
+    char *processor_signature;
+    char *processor_version;
+    char *processor_external_clock;
+    char *processor_max_speed;
+    char *processor_status;
+    char *processor_serial_number;
+    char *processor_part_number;
+};
+
+typedef struct _virSysinfoMemoryDef virSysinfoMemoryDef;
+typedef virSysinfoMemoryDef *virSysinfoMemoryDefPtr;
+struct _virSysinfoMemoryDef {
+    char *memory_size;
+    char *memory_form_factor;
+    char *memory_locator;
+    char *memory_bank_locator;
+    char *memory_type;
+    char *memory_type_detail;
+    char *memory_speed;
+    char *memory_manufacturer;
+    char *memory_serial_number;
+    char *memory_part_number;
+};
+
+typedef struct _virSysinfoDef virSysinfoDef;
+typedef virSysinfoDef *virSysinfoDefPtr;
+struct _virSysinfoDef {
+    int type;
+
+    char *bios_vendor;
+    char *bios_version;
+    char *bios_date;
+    char *bios_release;
+
+    char *system_manufacturer;
+    char *system_product;
+    char *system_version;
+    char *system_serial;
+    char *system_uuid;
+    char *system_sku;
+    char *system_family;
+
+    size_t nprocessor;
+    virSysinfoProcessorDefPtr processor;
+
+    size_t nmemory;
+    virSysinfoMemoryDefPtr memory;
+};
+
+virSysinfoDefPtr virSysinfoRead(void);
+
+void virSysinfoDefFree(virSysinfoDefPtr def);
+
+int virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+
+bool virSysinfoIsEqual(virSysinfoDefPtr src,
+                       virSysinfoDefPtr dst);
+
+VIR_ENUM_DECL(virSysinfo)
+
+#endif /* __VIR_SYSINFOS_H__ */
-- 
1.7.11.7


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]