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

qemu: command: Always execute memory device formatter

Browse Source 
Since we already make sure before that the domain configuration is
valid we may execute it always at the cost of doing 0 iterations of the
for loop.

This patch will simplify later refactor as it will avoid whitespace
changes.
This commit is contained in:
Peter Krempa 2015-10-07 15:40:58 +02:00
parent 0621f15ac7
commit a4b10a60ad
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/qemu/qemu_command.c
View File

@ -9401,38 +9401,37 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
if (virDomainNumaGetNodeCount(def->numa)) {
if (qemuBuildNumaArgStr(cfg, def, cmd, qemuCaps, nodeset) < 0)
if (virDomainNumaGetNodeCount(def->numa) &&
qemuBuildNumaArgStr(cfg, def, cmd, qemuCaps, nodeset) < 0)
goto error;
/* memory hotplug requires NUMA to be enabled - we already checked
* that memory devices are present only when NUMA is */
/* memory hotplug requires NUMA to be enabled - we already checked
* that memory devices are present only when NUMA is */
if (def->nmems > def->mem.memory_slots) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("memory device count '%zu' exceeds slots count '%u'"),
def->nmems, def->mem.memory_slots);
if (def->nmems > def->mem.memory_slots) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("memory device count '%zu' exceeds slots count '%u'"),
def->nmems, def->mem.memory_slots);
goto error;
}
for (i = 0; i < def->nmems; i++) {
char *backStr;
char *dimmStr;
if (!(backStr = qemuBuildMemoryDimmBackendStr(def->mems[i], def,
qemuCaps, cfg)))
goto error;
}
for (i = 0; i < def->nmems; i++) {
char *backStr;
char *dimmStr;
if (!(backStr = qemuBuildMemoryDimmBackendStr(def->mems[i], def,
qemuCaps, cfg)))
goto error;
if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i], def, qemuCaps))) {
VIR_FREE(backStr);
goto error;
}
virCommandAddArgList(cmd, "-object", backStr, "-device", dimmStr, NULL);
if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i], def, qemuCaps))) {
VIR_FREE(backStr);
VIR_FREE(dimmStr);
goto error;
}
virCommandAddArgList(cmd, "-object", backStr, "-device", dimmStr, NULL);
VIR_FREE(backStr);
VIR_FREE(dimmStr);
}
virCommandAddArgList(cmd, "-uuid", uuid, NULL);