提交 25c39f76 编写于 作者: P Peter Krempa

qemu: command: Pass numad nodeset when formatting memory devices at boot

When starting up a VM libvirtd asks numad to place the VM in case of
automatic nodeset. The nodeset would not be passed to the memory device
formatter and the user would get an error.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1269715
上级 95bbe4bf
...@@ -2945,7 +2945,8 @@ static char * ...@@ -2945,7 +2945,8 @@ static char *
qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem, qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
virDomainDefPtr def, virDomainDefPtr def,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virQEMUDriverConfigPtr cfg) virQEMUDriverConfigPtr cfg,
virBitmapPtr auto_nodeset)
{ {
virJSONValuePtr props = NULL; virJSONValuePtr props = NULL;
char *alias = NULL; char *alias = NULL;
...@@ -2962,7 +2963,7 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem, ...@@ -2962,7 +2963,7 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
goto cleanup; goto cleanup;
if (qemuBuildMemoryBackendStr(mem->size, mem->pagesize, if (qemuBuildMemoryBackendStr(mem->size, mem->pagesize,
mem->targetNode, mem->sourceNodes, NULL, mem->targetNode, mem->sourceNodes, auto_nodeset,
def, qemuCaps, cfg, def, qemuCaps, cfg,
&backendType, &props, true) < 0) &backendType, &props, true) < 0)
goto cleanup; goto cleanup;
...@@ -7200,7 +7201,7 @@ qemuBuildNumaCommandLine(virCommandPtr cmd, ...@@ -7200,7 +7201,7 @@ qemuBuildNumaCommandLine(virCommandPtr cmd,
char *dimmStr; char *dimmStr;
if (!(backStr = qemuBuildMemoryDimmBackendStr(def->mems[i], def, if (!(backStr = qemuBuildMemoryDimmBackendStr(def->mems[i], def,
qemuCaps, cfg))) qemuCaps, cfg, nodeset)))
return -1; return -1;
if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i]))) { if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i]))) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册