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

qemu: process: Extract gathering of 'numad' placement into a function

Browse Source 
Remove the code from qemuProcessPrepareDomain so that it won't get even
more bloated.
This commit is contained in:
Peter Krempa 2017-07-12 09:06:42 +02:00
parent 95d5601018
commit 9f3e65fc7a
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/qemu/qemu_process.c
View File

@ -5168,6 +5168,43 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
} }
static int
qemuProcessPrepareDomainNUMAPlacement(virDomainObjPtr vm,
virCapsPtr caps)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
char *nodeset = NULL;
int ret = -1;
/* Get the advisory nodeset from numad if 'placement' of
* either <vcpu> or <numatune> is 'auto'.
*/
if (!virDomainDefNeedsPlacementAdvice(vm->def))
return 0;
nodeset = virNumaGetAutoPlacementAdvice(virDomainDefGetVcpus(vm->def),
virDomainDefGetMemoryTotal(vm->def));
if (!nodeset)
goto cleanup;
VIR_DEBUG("Nodeset returned from numad: %s", nodeset);
if (virBitmapParse(nodeset, &priv->autoNodeset, VIR_DOMAIN_CPUMASK_LEN) < 0)
goto cleanup;
if (!(priv->autoCpuset = virCapabilitiesGetCpusForNodemask(caps,
priv->autoNodeset)))
goto cleanup;
ret = 0;
cleanup:
VIR_FREE(nodeset);
return ret;
}
/** /**
* qemuProcessPrepareDomain * qemuProcessPrepareDomain
* *
@ -5188,7 +5225,6 @@ qemuProcessPrepareDomain(virConnectPtr conn,
{ {
int ret = -1; int ret = -1;
size_t i; size_t i;
char *nodeset = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
virCapsPtr caps; virCapsPtr caps;
@ -5206,25 +5242,8 @@ qemuProcessPrepareDomain(virConnectPtr conn,
} }
virDomainAuditSecurityLabel(vm, true); virDomainAuditSecurityLabel(vm, true);
/* Get the advisory nodeset from numad if 'placement' of if (qemuProcessPrepareDomainNUMAPlacement(vm, caps) < 0)
* either <vcpu> or <numatune> is 'auto'.
*/
if (virDomainDefNeedsPlacementAdvice(vm->def)) {
nodeset = virNumaGetAutoPlacementAdvice(virDomainDefGetVcpus(vm->def),
virDomainDefGetMemoryTotal(vm->def));
if (!nodeset)
goto cleanup; goto cleanup;
VIR_DEBUG("Nodeset returned from numad: %s", nodeset);
if (virBitmapParse(nodeset, &priv->autoNodeset,
VIR_DOMAIN_CPUMASK_LEN) < 0)
goto cleanup;
if (!(priv->autoCpuset = virCapabilitiesGetCpusForNodemask(caps,
priv->autoNodeset)))
goto cleanup;
}
} }
/* Whether we should use virtlogd as stdio handler for character /* Whether we should use virtlogd as stdio handler for character
@ -5295,7 +5314,6 @@ qemuProcessPrepareDomain(virConnectPtr conn,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(nodeset);
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;