External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: numa: Add accessor for the NUMA node cpu mask

Browse Source 
Add virDomainNumaGetNodeCpumask() and refactor a few places that would
get the cpu mask without the helper.
This commit is contained in:
Peter Krempa 2015-02-16 18:38:43 +01:00
parent be22d07315
commit d9a779a36e
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/numa_conf.c
View File

@ -771,7 +771,7 @@ virDomainNumaDefCPUFormat(virBufferPtr buf,
for (i = 0; i < ncells; i++) { for (i = 0; i < ncells; i++) {
memAccess = def->cells[i].memAccess; memAccess = def->cells[i].memAccess;
if (!(cpustr = virBitmapFormat(def->cells[i].cpumask))) if (!(cpustr = virBitmapFormat(virDomainNumaGetNodeCpumask(def, i))))
return -1; return -1;
virBufferAddLit(buf, "<cell"); virBufferAddLit(buf, "<cell");
@ -799,7 +799,7 @@ virDomainNumaGetCPUCountTotal(virCPUDefPtr numa)
unsigned int ret = 0; unsigned int ret = 0;
for (i = 0; i < numa->ncells; i++) for (i = 0; i < numa->ncells; i++)
ret += virBitmapCountBits(numa->cells[i].cpumask); ret += virBitmapCountBits(virDomainNumaGetNodeCpumask(numa, i));
return ret; return ret;
} }
@ -824,3 +824,11 @@ virDomainNumaGetNodeCount(virCPUDefPtr numa)
return numa->ncells; return numa->ncells;
} }
virBitmapPtr
virDomainNumaGetNodeCpumask(virCPUDefPtr numa,
size_t node)
{
return numa->cells[node].cpumask;
}

3
src/conf/numa_conf.h
View File

@ -88,6 +88,9 @@ int virDomainNumatuneMaybeGetNodeset(virDomainNumaPtr numatune,
size_t virDomainNumaGetNodeCount(virCPUDefPtr numa) size_t virDomainNumaGetNodeCount(virCPUDefPtr numa)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
virBitmapPtr virDomainNumaGetNodeCpumask(virCPUDefPtr numa,
size_t node)
ATTRIBUTE_NONNULL(1);
/* /*
* Formatters * Formatters

1
src/libvirt_private.syms
View File

@ -630,6 +630,7 @@ virNodeDeviceObjUnlock;
virDomainNumaEquals; virDomainNumaEquals;
virDomainNumaFree; virDomainNumaFree;
virDomainNumaGetNodeCount; virDomainNumaGetNodeCount;
virDomainNumaGetNodeCpumask;
virDomainNumaNew; virDomainNumaNew;
virDomainNumatuneFormatNodeset; virDomainNumatuneFormatNodeset;
virDomainNumatuneFormatXML; virDomainNumatuneFormatXML;

2
src/qemu/qemu_command.c
View File

@ -7199,7 +7199,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
for (i = 0; i < ncells; i++) { for (i = 0; i < ncells; i++) {
VIR_FREE(cpumask); VIR_FREE(cpumask);
if (!(cpumask = virBitmapFormat(def->cpu->cells[i].cpumask))) if (!(cpumask = virBitmapFormat(virDomainNumaGetNodeCpumask(def->cpu, i))))
goto cleanup; goto cleanup;
if (strchr(cpumask, ',') && if (strchr(cpumask, ',') &&