47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
|
From 6a0f76d72b231bf0baacf70d715aad387476ac98 Mon Sep 17 00:00:00 2001
|
||
|
|
From: xiaojin Yang <yangxiaojin2@huawei.com>
|
||
|
|
Date: Fri, 11 Mar 2022 16:03:02 +0800
|
||
|
|
Subject: [PATCH 7/8] qemuBuildNumaArgStr: Switch order of if() and for()
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
When building -numa command line there is a for() loop that
|
||
|
|
builds '-numa memdev=' for each guest NUMA node. And also
|
||
|
|
records in a local variable whether any of memory-object-*
|
||
|
|
backends must be used to satisfy desired config. Well, instead of
|
||
|
|
checking in each iteration whether corresponding capabilities are
|
||
|
|
set, we can do swap if() and for() and check only once.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Xiaojin Yang <yangxiaojin2@huawei.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_command.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
||
|
|
index dae6b5a7f9..f9b6d56209 100644
|
||
|
|
--- a/src/qemu/qemu_command.c
|
||
|
|
+++ b/src/qemu/qemu_command.c
|
||
|
|
@@ -7419,11 +7419,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
|
||
|
|
|
||
|
|
/* using of -numa memdev= cannot be combined with -numa mem=, thus we
|
||
|
|
* need to check which approach to use */
|
||
|
|
- for (i = 0; i < ncells; i++) {
|
||
|
|
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) ||
|
||
|
|
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE) ||
|
||
|
|
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD)) {
|
||
|
|
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) ||
|
||
|
|
+ virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE) ||
|
||
|
|
+ virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD)) {
|
||
|
|
|
||
|
|
+ for (i = 0; i < ncells; i++) {
|
||
|
|
if ((rc = qemuBuildMemoryCellBackendStr(def, cfg, i, priv,
|
||
|
|
&nodeBackends[i])) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|