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

qemu: Don't return memory device config on error in qemuBuildMemoryBackendStr

Browse Source 
In the last section if the function determines that the config is
invalid when QEMU doesn't support the memory device the JSON config
object would be returned even if it doesn't make sense.

Assign the object to be returned only on success.
This commit is contained in:
Peter Krempa 2015-03-23 14:17:42 +01:00
parent c35b277671
commit 104011ea8b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_command.c
View File

@ -4750,9 +4750,6 @@ qemuBuildMemoryBackendStr(unsigned long long size,
goto cleanup;
}
*backendProps = props;
props = NULL;
if (!hugepage) {
bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, guestNode);
@ -4767,11 +4764,15 @@ qemuBuildMemoryBackendStr(unsigned long long size,
/* report back that using the new backend is not necessary to achieve
* the desired configuration */
if (!userNodeset && !nodeSpecified) {
*backendProps = props;
props = NULL;
ret = 1;
goto cleanup;
}
}
*backendProps = props;
props = NULL;
ret = 0;
cleanup: