mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-25 12:52:19 +00:00
qemuBuildNumaArgStr: Use modern -numa memdev= if old -numa mem= is unsupported
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>
This commit is contained in:
parent
0246a4f0a7
commit
aad31f46fb
@ -7038,6 +7038,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
|
|||||||
if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset))
|
if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
|
if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
|
||||||
|
def->virtType,
|
||||||
|
def->os.machine))
|
||||||
|
needBackend = true;
|
||||||
|
|
||||||
if (VIR_ALLOC_N(nodeBackends, ncells) < 0)
|
if (VIR_ALLOC_N(nodeBackends, ncells) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
@ -7055,6 +7060,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
|
|||||||
if (rc == 0)
|
if (rc == 0)
|
||||||
needBackend = true;
|
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 &&
|
if (!needBackend &&
|
||||||
|
Loading…
x
Reference in New Issue
Block a user