External/libvirt
1
0
Fork 0
Code

qemu: pass priv data instead of qemuCaps and autoNodeset

Browse Source 
Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-10-11 13:09:50 +02:00
parent 2dfef1240a
commit 17f1a647a0
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/qemu/qemu_command.c
View File

@ -3568,10 +3568,9 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,
static int static int
qemuBuildMemoryCellBackendStr(virDomainDefPtr def, qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
size_t cell, size_t cell,
virBitmapPtr auto_nodeset, qemuDomainObjPrivatePtr priv,
char **backendStr) char **backendStr)
{ {
virJSONValuePtr props = NULL; virJSONValuePtr props = NULL;
@ -3590,8 +3589,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
if (virAsprintf(&alias, "ram-node%zu", cell) < 0) if (virAsprintf(&alias, "ram-node%zu", cell) < 0)
goto cleanup; goto cleanup;
if ((rc = qemuBuildMemoryBackendStr(&props, &backendType, cfg, qemuCaps, if ((rc = qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps,
def, &mem, auto_nodeset, false)) < 0) def, &mem, priv->autoNodeset, false)) < 0)
goto cleanup; goto cleanup;
if (!(*backendStr = virQEMUBuildObjectCommandlineFromJSON(backendType, if (!(*backendStr = virQEMUBuildObjectCommandlineFromJSON(backendType,
@ -3612,9 +3611,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
static char * static char *
qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem, qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
virDomainDefPtr def, virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
virBitmapPtr auto_nodeset) qemuDomainObjPrivatePtr priv)
{ {
virJSONValuePtr props = NULL; virJSONValuePtr props = NULL;
char *alias = NULL; char *alias = NULL;
@ -3630,8 +3628,8 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0) if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0)
goto cleanup; goto cleanup;
if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, qemuCaps, if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps,
def, mem, auto_nodeset, true) < 0) def, mem, priv->autoNodeset, true) < 0)
goto cleanup; goto cleanup;
ret = virQEMUBuildObjectCommandlineFromJSON(backendType, alias, props); ret = virQEMUBuildObjectCommandlineFromJSON(backendType, alias, props);
@ -7742,10 +7740,10 @@ static int
qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
virDomainDefPtr def, virDomainDefPtr def,
virCommandPtr cmd, virCommandPtr cmd,
virQEMUCapsPtr qemuCaps, qemuDomainObjPrivatePtr priv)
virBitmapPtr auto_nodeset)
{ {
size_t i; size_t i;
virQEMUCapsPtr qemuCaps = priv->qemuCaps;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char *cpumask = NULL, *tmpmask = NULL, *next = NULL; char *cpumask = NULL, *tmpmask = NULL, *next = NULL;
char **nodeBackends = NULL; char **nodeBackends = NULL;
@ -7773,7 +7771,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
goto cleanup; goto cleanup;
} }
if (!virDomainNumatuneNodesetIsAvailable(def->numa, auto_nodeset)) if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset))
goto cleanup; goto cleanup;
for (i = 0; i < def->mem.nhugepages; i++) { for (i = 0; i < def->mem.nhugepages; i++) {
@ -7808,8 +7806,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
for (i = 0; i < ncells; i++) { for (i = 0; i < ncells; i++) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) ||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) { virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) {
if ((rc = qemuBuildMemoryCellBackendStr(def, qemuCaps, cfg, i, if ((rc = qemuBuildMemoryCellBackendStr(def, cfg, i, priv,
auto_nodeset,
&nodeBackends[i])) < 0) &nodeBackends[i])) < 0)
goto cleanup; goto cleanup;
@ -7884,8 +7881,7 @@ static int
qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
virDomainDefPtr def, virDomainDefPtr def,
virQEMUCapsPtr qemuCaps, qemuDomainObjPrivatePtr priv)
virBitmapPtr nodeset)
{ {
size_t i; size_t i;
@ -7896,7 +7892,7 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd,
char *dimmStr; char *dimmStr;
if (!(backStr = qemuBuildMemoryDimmBackendStr(def->mems[i], def, if (!(backStr = qemuBuildMemoryDimmBackendStr(def->mems[i], def,
qemuCaps, cfg, nodeset))) cfg, priv)))
return -1; return -1;
if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i]))) { if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i]))) {
@ -9985,7 +9981,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
virQEMUCapsPtr qemuCaps = priv->qemuCaps; virQEMUCapsPtr qemuCaps = priv->qemuCaps;
virBitmapPtr nodeset = priv->autoNodeset;
bool chardevStdioLogd = priv->chardevStdioLogd; bool chardevStdioLogd = priv->chardevStdioLogd;
VIR_DEBUG("driver=%p def=%p mon=%p json=%d " VIR_DEBUG("driver=%p def=%p mon=%p json=%d "
@ -10041,10 +10036,10 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
goto error; goto error;
if (virDomainNumaGetNodeCount(def->numa) && if (virDomainNumaGetNodeCount(def->numa) &&
qemuBuildNumaArgStr(cfg, def, cmd, qemuCaps, nodeset) < 0) qemuBuildNumaArgStr(cfg, def, cmd, priv) < 0)
goto error; goto error;
if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, qemuCaps, nodeset) < 0) if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0)
goto error; goto error;
virUUIDFormat(def->uuid, uuid); virUUIDFormat(def->uuid, uuid);