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

conf: Extract code formatting vCPU info

Browse Source
This commit is contained in:
Peter Krempa 2016-06-14 11:35:39 +02:00
parent dfe0f42301
commit 54f875dc53
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/conf/domain_conf.c
View File

@ -22779,6 +22779,35 @@ virDomainCputuneDefFormat(virBufferPtr buf,
} }
static int
virDomainCpuDefFormat(virBufferPtr buf,
const virDomainDef *def)
{
char *cpumask = NULL;
int ret = -1;
virBufferAddLit(buf, "<vcpu");
virBufferAsprintf(buf, " placement='%s'",
virDomainCpuPlacementModeTypeToString(def->placement_mode));
if (def->cpumask && !virBitmapIsAllSet(def->cpumask)) {
if ((cpumask = virBitmapFormat(def->cpumask)) == NULL)
goto cleanup;
virBufferAsprintf(buf, " cpuset='%s'", cpumask);
}
if (virDomainDefHasVcpusOffline(def))
virBufferAsprintf(buf, " current='%u'", virDomainDefGetVcpus(def));
virBufferAsprintf(buf, ">%u</vcpu>\n", virDomainDefGetVcpusMax(def));
ret = 0;
cleanup:
VIR_FREE(cpumask);
return ret;
}
/* This internal version appends to an existing buffer /* This internal version appends to an existing buffer
* (possibly with auto-indent), rather than flattening * (possibly with auto-indent), rather than flattening
* to string. * to string.
@ -22954,20 +22983,8 @@ virDomainDefFormatInternal(virDomainDefPtr def,
virBufferAddLit(buf, "</memoryBacking>\n"); virBufferAddLit(buf, "</memoryBacking>\n");
} }
virBufferAddLit(buf, "<vcpu"); if (virDomainCpuDefFormat(buf, def) < 0)
virBufferAsprintf(buf, " placement='%s'",
virDomainCpuPlacementModeTypeToString(def->placement_mode));
if (def->cpumask && !virBitmapIsAllSet(def->cpumask)) {
char *cpumask = NULL;
if ((cpumask = virBitmapFormat(def->cpumask)) == NULL)
goto error; goto error;
virBufferAsprintf(buf, " cpuset='%s'", cpumask);
VIR_FREE(cpumask);
}
if (virDomainDefHasVcpusOffline(def))
virBufferAsprintf(buf, " current='%u'", virDomainDefGetVcpus(def));
virBufferAsprintf(buf, ">%u</vcpu>\n", virDomainDefGetVcpusMax(def));
if (def->niothreadids > 0) { if (def->niothreadids > 0) {
virBufferAsprintf(buf, "<iothreads>%u</iothreads>\n", virBufferAsprintf(buf, "<iothreads>%u</iothreads>\n",