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

Add canonical machine name to capabilities output

Browse Source 
e.g. <machine canonical='pc'>pc-0.11</machine>

* src/capabilities.c: output the canonical machine names in the
  capabilities output, if available

* docs/schemas/capabilities.rng: add the new attribute
This commit is contained in:
Mark McLoughlin 2009-07-23 18:31:35 +01:00
parent c14c6b083e
commit 0f15d0344d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/schemas/capability.rng
View File

@ -196,6 +196,11 @@
<define name='machine'> <define name='machine'>
<element name='machine'> <element name='machine'>
<optional>
<attribute name='canonical'>
<text/>
</attribute>
</optional>
<text/> <text/>
</element> </element>
</define> </define>

14
src/capabilities.c
View File

@ -692,8 +692,11 @@ virCapabilitiesFormatXML(virCapsPtr caps)
caps->guests[i]->arch.defaultInfo.loader); caps->guests[i]->arch.defaultInfo.loader);
for (j = 0 ; j < caps->guests[i]->arch.defaultInfo.nmachines ; j++) { for (j = 0 ; j < caps->guests[i]->arch.defaultInfo.nmachines ; j++) {
virBufferVSprintf(&xml, " <machine>%s</machine>\n", virCapsGuestMachinePtr machine = caps->guests[i]->arch.defaultInfo.machines[j];
caps->guests[i]->arch.defaultInfo.machines[j]->name); virBufferAddLit(&xml, " <machine");
if (machine->canonical)
virBufferVSprintf(&xml, " canonical='%s'", machine->canonical);
virBufferVSprintf(&xml, ">%s</machine>\n", machine->name);
} }
for (j = 0 ; j < caps->guests[i]->arch.ndomains ; j++) { for (j = 0 ; j < caps->guests[i]->arch.ndomains ; j++) {
@ -707,8 +710,11 @@ virCapabilitiesFormatXML(virCapsPtr caps)
caps->guests[i]->arch.domains[j]->info.loader); caps->guests[i]->arch.domains[j]->info.loader);
for (k = 0 ; k < caps->guests[i]->arch.domains[j]->info.nmachines ; k++) { for (k = 0 ; k < caps->guests[i]->arch.domains[j]->info.nmachines ; k++) {
virBufferVSprintf(&xml, " <machine>%s</machine>\n", virCapsGuestMachinePtr machine = caps->guests[i]->arch.domains[j]->info.machines[k];
caps->guests[i]->arch.domains[j]->info.machines[k]->name); virBufferAddLit(&xml, " <machine");
if (machine->canonical)
virBufferVSprintf(&xml, " canonical='%s'", machine->canonical);
virBufferVSprintf(&xml, ">%s</machine>\n", machine->name);
} }
virBufferAddLit(&xml, " </domain>\n"); virBufferAddLit(&xml, " </domain>\n");
} }