External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

On systems with dmidecode version 2.10 or older,

Browse Source 
dmidecode displays processor information, followed by BIOS, system and
 memory-DIMM details.
 Calls to virSysinfoParseBIOS(), virSysinfoParseSystem() would update
 the buffer pointer 'base', so the processor information would be lost
 before virSysinfoParseProcessor() was called. Sysinfo would therefore
 not be able to display processor details -- It only described <bios>,
 <system> and <memory_device> details.
 This patch attempts to insulate sysinfo from ordering of dmidecode
 output.

Before the fix:
---------------
virsh # sysinfo
<sysinfo type='smbios'>
  <bios>
    ....
  </bios>
  <system>
    ....
  </system>
  <memory_device>
    ....
  </memory_device>

After the fix:
-------------
virsh # sysinfo
<sysinfo type='smbios'>
  <bios>
    ....
  </bios>
  <system>
    ....
  </system>
  <processor>
    ....
  </processor>
  <memory_device>
    ....
  </memory_device>
This commit is contained in:
Prerna Saxena 2012-02-07 17:05:37 +05:30 committed by Eric Blake
parent 0ed86cfb51
commit a76530c9c7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/sysinfo.c
View File

@ -453,7 +453,7 @@ no_memory:
virSysinfoDefPtr
virSysinfoRead(void) {
char *path, *base;
char *path;
virSysinfoDefPtr ret = NULL;
char *outbuf = NULL;
virCommandPtr cmd;
@ -481,22 +481,20 @@ virSysinfoRead(void) {
ret->type = VIR_SYSINFO_SMBIOS;
base = outbuf;
if ((base = virSysinfoParseBIOS(base, ret)) == NULL)
if ((virSysinfoParseBIOS(outbuf, ret)) == NULL)
goto no_memory;
if ((base = virSysinfoParseSystem(base, ret)) == NULL)
if ((virSysinfoParseSystem(outbuf, ret)) == NULL)
goto no_memory;
ret->nprocessor = 0;
ret->processor = NULL;
if ((base = virSysinfoParseProcessor(base, ret)) == NULL)
if ((virSysinfoParseProcessor(outbuf, ret)) == NULL)
goto no_memory;
ret->nmemory = 0;
ret->memory = NULL;
if (virSysinfoParseMemory(base, ret) == NULL)
if (virSysinfoParseMemory(outbuf, ret) == NULL)
goto no_memory;
cleanup: