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 to NUMA node's memory access mode

Browse Source
This commit is contained in:
Peter Krempa 2015-02-16 18:51:36 +01:00
parent d9a779a36e
commit 7800d473f5
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/numa_conf.c
View File

@ -769,7 +769,7 @@ virDomainNumaDefCPUFormat(virBufferPtr buf,
virBufferAddLit(buf, "<numa>\n"); virBufferAddLit(buf, "<numa>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
for (i = 0; i < ncells; i++) { for (i = 0; i < ncells; i++) {
memAccess = def->cells[i].memAccess; memAccess = virDomainNumaGetNodeMemoryAccessMode(def, i);
if (!(cpustr = virBitmapFormat(virDomainNumaGetNodeCpumask(def, i)))) if (!(cpustr = virBitmapFormat(virDomainNumaGetNodeCpumask(def, i))))
return -1; return -1;
@ -832,3 +832,11 @@ virDomainNumaGetNodeCpumask(virCPUDefPtr numa,
{ {
return numa->cells[node].cpumask; return numa->cells[node].cpumask;
} }
virNumaMemAccess
virDomainNumaGetNodeMemoryAccessMode(virCPUDefPtr numa,
size_t node)
{
return numa->cells[node].memAccess;
}

3
src/conf/numa_conf.h
View File

@ -91,6 +91,9 @@ size_t virDomainNumaGetNodeCount(virCPUDefPtr numa)
virBitmapPtr virDomainNumaGetNodeCpumask(virCPUDefPtr numa, virBitmapPtr virDomainNumaGetNodeCpumask(virCPUDefPtr numa,
size_t node) size_t node)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
virNumaMemAccess virDomainNumaGetNodeMemoryAccessMode(virCPUDefPtr numa,
size_t node)
ATTRIBUTE_NONNULL(1);
/* /*
* Formatters * Formatters

1
src/libvirt_private.syms
View File

@ -631,6 +631,7 @@ virDomainNumaEquals;
virDomainNumaFree; virDomainNumaFree;
virDomainNumaGetNodeCount; virDomainNumaGetNodeCount;
virDomainNumaGetNodeCpumask; virDomainNumaGetNodeCpumask;
virDomainNumaGetNodeMemoryAccessMode;
virDomainNumaNew; virDomainNumaNew;
virDomainNumatuneFormatNodeset; virDomainNumatuneFormatNodeset;
virDomainNumatuneFormatXML; virDomainNumatuneFormatXML;

5
src/qemu/qemu_command.c
View File

@ -4558,7 +4558,8 @@ qemuBuildMemoryBackendStr(unsigned long long size,
virDomainHugePagePtr hugepage = NULL; virDomainHugePagePtr hugepage = NULL;
virDomainNumatuneMemMode mode; virDomainNumatuneMemMode mode;
const long system_page_size = virGetSystemPageSizeKB(); const long system_page_size = virGetSystemPageSizeKB();
virNumaMemAccess memAccess = def->cpu->cells[guestNode].memAccess; virNumaMemAccess memAccess = virDomainNumaGetNodeMemoryAccessMode(def->cpu, guestNode);
size_t i; size_t i;
char *mem_path = NULL; char *mem_path = NULL;
virBitmapPtr nodemask = NULL; virBitmapPtr nodemask = NULL;
@ -7188,7 +7189,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
if (rc == 0) if (rc == 0)
needBackend = true; needBackend = true;
} else { } else {
if (def->cpu->cells[i].memAccess) { if (virDomainNumaGetNodeMemoryAccessMode(def->cpu, i)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Shared memory mapping is not supported " _("Shared memory mapping is not supported "
"with this QEMU")); "with this QEMU"));