58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From a6fccda9f1637a3464e812a16c2cd1f12d5b213d Mon Sep 17 00:00:00 2001
|
|
From: xiaojin Yang <yangxiaojin2@huawei.com>
|
|
Date: Fri, 11 Mar 2022 16:04:38 +0800
|
|
Subject: [PATCH 8/8] qemuBuildNumaArgStr: Use modern -numa memdev= if old
|
|
-numa mem= is unsupported
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
In previous commit we started tracking whether QEMU supports
|
|
'-numa mem='. This is tied to the machine type because migration
|
|
from '-numa mem=' to '-numa memdev' is impossible (or vice
|
|
versa). But since it's tied to a machine type (where migration
|
|
from one to another is also unsupported) we can allow QEMU to get
|
|
rid of the deprecated command line.
|
|
|
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1783355
|
|
|
|
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 | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
index f9b6d56209..f8331a7455 100644
|
|
--- a/src/qemu/qemu_command.c
|
|
+++ b/src/qemu/qemu_command.c
|
|
@@ -7414,6 +7414,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
|
|
if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset))
|
|
goto cleanup;
|
|
|
|
+ if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
|
|
+ def->virtType,
|
|
+ def->os.machine))
|
|
+ needBackend = true;
|
|
+
|
|
if (VIR_ALLOC_N(nodeBackends, ncells) < 0)
|
|
goto cleanup;
|
|
|
|
@@ -7431,6 +7436,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
|
|
if (rc == 0)
|
|
needBackend = true;
|
|
}
|
|
+ } else if (needBackend) {
|
|
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
+ _("NUMA without specified memory backing is not "
|
|
+ "supported with this QEMU binary"));
|
|
+ goto cleanup;
|
|
}
|
|
|
|
if (!needBackend &&
|
|
--
|
|
2.27.0
|
|
|