NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: eliminate hardcoded indent in virConnectSysInfo formatting

Browse Source 
This same set of functions is used by the qemu, xen, and lxc drivers'
connectSysInfo function.
This commit is contained in:
Laine Stump 2014-03-12 18:03:03 -06:00
parent acca913493
commit 3f05dc6de8
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/virsysinfo.c
View File

@ -1,7 +1,7 @@
/* /*
* virsysinfo.c: get SMBIOS/sysinfo information from the host * virsysinfo.c: get SMBIOS/sysinfo information from the host
* *
* Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2010-2014 Red Hat, Inc.
* Copyright (C) 2010 Daniel Veillard * Copyright (C) 2010 Daniel Veillard
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -881,6 +881,7 @@ virSysinfoBIOSFormat(virBufferPtr buf, virSysinfoDefPtr def)
return; return;
virBufferAddLit(buf, "<bios>\n"); virBufferAddLit(buf, "<bios>\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<entry name='vendor'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='vendor'>%s</entry>\n",
def->bios_vendor); def->bios_vendor);
virBufferEscapeString(buf, "<entry name='version'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='version'>%s</entry>\n",
@ -889,6 +890,7 @@ virSysinfoBIOSFormat(virBufferPtr buf, virSysinfoDefPtr def)
def->bios_date); def->bios_date);
virBufferEscapeString(buf, "<entry name='release'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='release'>%s</entry>\n",
def->bios_release); def->bios_release);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</bios>\n"); virBufferAddLit(buf, "</bios>\n");
} }
@ -901,6 +903,7 @@ virSysinfoSystemFormat(virBufferPtr buf, virSysinfoDefPtr def)
return; return;
virBufferAddLit(buf, "<system>\n"); virBufferAddLit(buf, "<system>\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<entry name='manufacturer'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='manufacturer'>%s</entry>\n",
def->system_manufacturer); def->system_manufacturer);
virBufferEscapeString(buf, "<entry name='product'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='product'>%s</entry>\n",
@ -915,6 +918,7 @@ virSysinfoSystemFormat(virBufferPtr buf, virSysinfoDefPtr def)
def->system_sku); def->system_sku);
virBufferEscapeString(buf, "<entry name='family'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='family'>%s</entry>\n",
def->system_family); def->system_family);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</system>\n"); virBufferAddLit(buf, "</system>\n");
} }
@ -941,7 +945,7 @@ virSysinfoProcessorFormat(virBufferPtr buf, virSysinfoDefPtr def)
continue; continue;
virBufferAddLit(buf, "<processor>\n"); virBufferAddLit(buf, "<processor>\n");
virBufferAdjustIndent(buf, 4); virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, virBufferEscapeString(buf,
"<entry name='socket_destination'>%s</entry>\n", "<entry name='socket_destination'>%s</entry>\n",
processor->processor_socket_destination); processor->processor_socket_destination);
@ -965,7 +969,7 @@ virSysinfoProcessorFormat(virBufferPtr buf, virSysinfoDefPtr def)
processor->processor_serial_number); processor->processor_serial_number);
virBufferEscapeString(buf, "<entry name='part_number'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='part_number'>%s</entry>\n",
processor->processor_part_number); processor->processor_part_number);
virBufferAdjustIndent(buf, -4); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</processor>\n"); virBufferAddLit(buf, "</processor>\n");
} }
} }
@ -992,6 +996,7 @@ virSysinfoMemoryFormat(virBufferPtr buf, virSysinfoDefPtr def)
continue; continue;
virBufferAddLit(buf, "<memory_device>\n"); virBufferAddLit(buf, "<memory_device>\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<entry name='size'>%s</entry>\n", virBufferEscapeString(buf, "<entry name='size'>%s</entry>\n",
memory->memory_size); memory->memory_size);
virBufferEscapeString(buf, virBufferEscapeString(buf,
@ -1018,6 +1023,7 @@ virSysinfoMemoryFormat(virBufferPtr buf, virSysinfoDefPtr def)
virBufferEscapeString(buf, virBufferEscapeString(buf,
"<entry name='part_number'>%s</entry>\n", "<entry name='part_number'>%s</entry>\n",
memory->memory_part_number); memory->memory_part_number);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</memory_device>\n"); virBufferAddLit(buf, "</memory_device>\n");
} }
} }
@ -1043,12 +1049,14 @@ virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def)
} }
virBufferAsprintf(buf, "<sysinfo type='%s'>\n", type); virBufferAsprintf(buf, "<sysinfo type='%s'>\n", type);
virBufferAdjustIndent(buf, 2);
virSysinfoBIOSFormat(buf, def); virSysinfoBIOSFormat(buf, def);
virSysinfoSystemFormat(buf, def); virSysinfoSystemFormat(buf, def);
virSysinfoProcessorFormat(buf, def); virSysinfoProcessorFormat(buf, def);
virSysinfoMemoryFormat(buf, def); virSysinfoMemoryFormat(buf, def);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</sysinfo>\n"); virBufferAddLit(buf, "</sysinfo>\n");
if (virBufferError(buf)) { if (virBufferError(buf)) {