External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 02:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Move NUMA cell formatter to numa_conf

Browse Source 
Move the code that formats the /domain/cpu/numa element to numa_conf as
it belongs there.
This commit is contained in:
Peter Krempa 2015-02-11 14:26:19 +01:00
parent 2562141f19
commit 456268d46b
3 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/conf/cpu_conf.c
View File

@ -495,8 +495,11 @@ virCPUDefFormatBufFull(virBufferPtr buf,
virArchToString(def->arch)); virArchToString(def->arch));
if (virCPUDefFormatBuf(buf, def, updateCPU) < 0) if (virCPUDefFormatBuf(buf, def, updateCPU) < 0)
return -1; return -1;
virBufferAdjustIndent(buf, -2);
if (virDomainNumaDefCPUFormat(buf, def) < 0)
return -1;
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</cpu>\n"); virBufferAddLit(buf, "</cpu>\n");
return 0; return 0;
@ -591,30 +594,6 @@ virCPUDefFormatBuf(virBufferPtr buf,
} }
} }
if (def->ncells) {
virBufferAddLit(buf, "<numa>\n");
virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->ncells; i++) {
virMemAccess memAccess = def->cells[i].memAccess;
char *cpustr = NULL;
if (!(cpustr = virBitmapFormat(def->cells[i].cpumask)))
return -1;
virBufferAddLit(buf, "<cell");
virBufferAsprintf(buf, " id='%zu'", i);
virBufferAsprintf(buf, " cpus='%s'", cpustr);
virBufferAsprintf(buf, " memory='%llu'", def->cells[i].mem);
virBufferAddLit(buf, " unit='KiB'");
if (memAccess)
virBufferAsprintf(buf, " memAccess='%s'",
virMemAccessTypeToString(memAccess));
virBufferAddLit(buf, "/>\n");
VIR_FREE(cpustr);
}
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</numa>\n");
}
return 0; return 0;
} }

37
src/conf/numa_conf.c
View File

@ -777,3 +777,40 @@ virDomainNumaDefCPUParseXML(virCPUDefPtr def,
VIR_FREE(tmp); VIR_FREE(tmp);
return ret; return ret;
} }
int
virDomainNumaDefCPUFormat(virBufferPtr buf,
virCPUDefPtr def)
{
virMemAccess memAccess;
char *cpustr;
size_t i;
if (def->ncells == 0)
return 0;
virBufferAddLit(buf, "<numa>\n");
virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->ncells; i++) {
memAccess = def->cells[i].memAccess;
if (!(cpustr = virBitmapFormat(def->cells[i].cpumask)))
return -1;
virBufferAddLit(buf, "<cell");
virBufferAsprintf(buf, " id='%zu'", i);
virBufferAsprintf(buf, " cpus='%s'", cpustr);
virBufferAsprintf(buf, " memory='%llu'", def->cells[i].mem);
virBufferAddLit(buf, " unit='KiB'");
if (memAccess)
virBufferAsprintf(buf, " memAccess='%s'",
virMemAccessTypeToString(memAccess));
virBufferAddLit(buf, "/>\n");
VIR_FREE(cpustr);
}
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</numa>\n");
return 0;
}

1
src/conf/numa_conf.h
View File

@ -117,5 +117,6 @@ bool virDomainNumatuneNodeSpecified(virDomainNumatunePtr numatune,
int cellid); int cellid);
int virDomainNumaDefCPUParseXML(virCPUDefPtr def, xmlXPathContextPtr ctxt); int virDomainNumaDefCPUParseXML(virCPUDefPtr def, xmlXPathContextPtr ctxt);
int virDomainNumaDefCPUFormat(virBufferPtr buf, virCPUDefPtr def);
#endif /* __NUMA_CONF_H__ */ #endif /* __NUMA_CONF_H__ */